diff --git a/InstructorsAndTrainees/instructors/editorinstructors.cpp b/InstructorsAndTrainees/instructors/editorinstructors.cpp index cda5dd2..73a37cd 100644 --- a/InstructorsAndTrainees/instructors/editorinstructors.cpp +++ b/InstructorsAndTrainees/instructors/editorinstructors.cpp @@ -13,7 +13,7 @@ EditorInstructors::EditorInstructors(ConnectorToServer* connectorToServer, bool ui->btnToOrFromArchive->setEnabled(false); ui->btnEdit->setEnabled(false); - connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorInstructors::on_treeWidget_currentItemChanged); + connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorInstructors::on_treeWidgetCurrentItemChanged); ui->verticalLayout_1->addWidget(treeWidget); @@ -219,7 +219,7 @@ void EditorInstructors::on_btnArchive_clicked() loadInstructorsFromDB(); } -void EditorInstructors::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void EditorInstructors::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) { //Определяем доступность и функционал кнопок для выбранного элемента diff --git a/InstructorsAndTrainees/instructors/editorinstructors.h b/InstructorsAndTrainees/instructors/editorinstructors.h index 63a82d1..b878dfc 100644 --- a/InstructorsAndTrainees/instructors/editorinstructors.h +++ b/InstructorsAndTrainees/instructors/editorinstructors.h @@ -25,7 +25,7 @@ private Q_SLOTS: void on_btnToOrFromArchive_clicked(); void on_btnEdit_clicked(); void on_btnArchive_clicked(); - void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); + void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); private: //void setCurrentInstructor(int id); diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/InstructorsAndTrainees/instructors/viewerinstructors.cpp index 0990f3e..3c5face 100644 --- a/InstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/InstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -9,7 +9,7 @@ ViewerInstructors::ViewerInstructors(ConnectorToServer* connectorToServer, QWidg { ui->setupUi(this); - connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerInstructors::on_treeWidget_itemClicked); + connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerInstructors::on_treeWidgetItemClicked); ui->horizontalLayout_1->addWidget(treeWidget); @@ -71,7 +71,7 @@ void ViewerInstructors::on_btnEditorInstructors_clicked() Q_EMIT signal_BlockAutorization(false); } -void ViewerInstructors::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column) +void ViewerInstructors::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column) { if(item == nullptr) return; diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.h b/InstructorsAndTrainees/instructors/viewerinstructors.h index ec7e43f..7be1cd5 100644 --- a/InstructorsAndTrainees/instructors/viewerinstructors.h +++ b/InstructorsAndTrainees/instructors/viewerinstructors.h @@ -33,7 +33,7 @@ public Q_SLOTS: void on_btnEditorInstructors_clicked(); public slots: - void on_treeWidget_itemClicked(QTreeWidgetItem *item, int column); + void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column); Q_SIGNALS: //сигнал о выборе инструктора diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 14af6e4..1f77489 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -27,7 +27,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre treeWidget = new QTreeWidget(); ui->horizontalLayout_Tree->addWidget(treeWidget); - connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidget_currentItemChanged); + connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidgetCurrentItemChanged); preparationTreeWidget(); @@ -147,7 +147,7 @@ void AMMtasksWidget::changeEvent(QEvent *event) } } -void AMMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void AMMtasksWidget::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) { if(current == nullptr) { diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index cdd7283..9f4222f 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h @@ -30,7 +30,7 @@ protected: void changeEvent(QEvent * event) override; private Q_SLOTS: - void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); + void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); void on_btnDelete_clicked(); void on_btnCheck_clicked(); void on_btnAssignTask_clicked(); diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index e13d405..c84cf73 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -28,7 +28,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre treeWidget = new QTreeWidget(); ui->horizontalLayout_Tree->addWidget(treeWidget); - connect(treeWidget, &QTreeWidget::currentItemChanged, this, &FIMtasksWidget::on_treeWidget_currentItemChanged); + connect(treeWidget, &QTreeWidget::currentItemChanged, this, &FIMtasksWidget::on_treeWidgetCurrentItemChanged); preparationTreeWidget(); @@ -150,7 +150,7 @@ void FIMtasksWidget::changeEvent(QEvent *event) } } -void FIMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void FIMtasksWidget::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) { if(current == nullptr) { diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index f8f1d06..e9b6b12 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h @@ -33,7 +33,7 @@ protected: void changeEvent(QEvent * event) override; private Q_SLOTS: - void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); + void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); void on_btnDelete_clicked(); void on_btnCheck_clicked(); void on_btnAssignTask_clicked(); diff --git a/InstructorsAndTrainees/trainees/editortrainees.cpp b/InstructorsAndTrainees/trainees/editortrainees.cpp index ccbf4f4..6078a32 100644 --- a/InstructorsAndTrainees/trainees/editortrainees.cpp +++ b/InstructorsAndTrainees/trainees/editortrainees.cpp @@ -10,7 +10,7 @@ EditorTrainees::EditorTrainees(ConnectorToServer* connectorToServer, bool adminM { ui->setupUi(this); - connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorTrainees::on_treeWidget_currentItemChanged); + connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorTrainees::on_treeWidgetCurrentItemChanged); ui->verticalLayout_1->addWidget(treeWidget); @@ -331,7 +331,7 @@ void EditorTrainees::on_btnArchive_clicked() loadTraineesFromDB(); } -void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void EditorTrainees::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) { //Определяем доступность и функционал кнопок для выбранного элемента diff --git a/InstructorsAndTrainees/trainees/editortrainees.h b/InstructorsAndTrainees/trainees/editortrainees.h index 17c39bd..e79dc38 100644 --- a/InstructorsAndTrainees/trainees/editortrainees.h +++ b/InstructorsAndTrainees/trainees/editortrainees.h @@ -28,7 +28,7 @@ private Q_SLOTS: void on_btnToOrFromArchiveTrainee_clicked(); void on_btnEdit_clicked(); void on_btnArchive_clicked(); - void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); + void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); private: //void setCurrentGroup(int id); diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index b462be8..a04a2af 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -13,7 +13,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo ui->setupUi(this); connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &ViewerTrainees::on_itemDoubleClicked); - connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerTrainees::on_treeWidget_itemClicked); + connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerTrainees::on_treeWidgetItemClicked); ui->horizontalLayout_1->addWidget(treeWidget); @@ -119,7 +119,7 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column) } } -void ViewerTrainees::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column) +void ViewerTrainees::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column) { if(item == nullptr) return; diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h index 9245297..037caee 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.h +++ b/InstructorsAndTrainees/trainees/viewertrainees.h @@ -37,7 +37,7 @@ public Q_SLOTS: void on_btnEditorTrainees_clicked(); private Q_SLOTS: void on_itemDoubleClicked(QTreeWidgetItem *item, int column); - void on_treeWidget_itemClicked(QTreeWidgetItem *item, int column); + void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column); Q_SIGNALS: //сигнал о выборе обучаемого