From 63653865b631124d5ee3eb4486cc70dcdf561b4d Mon Sep 17 00:00:00 2001 From: imn Date: Wed, 17 Sep 2014 13:39:47 +0400 Subject: [PATCH] Removed qt3 support and replaced qt macros --- src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx | 8 ++++---- src/GUI/HYBRIDPluginGUI_HypothesisCreator.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx index 4e2b814..63675a9 100644 --- a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx @@ -746,7 +746,7 @@ void HYBRIDPluginGUI_HypothesisCreator::checkVertexIsDefined() (myEnfVertexWdg->NbObjects() == 0 && !myXCoord->GetString().isEmpty() && !myYCoord->GetString().isEmpty() && !myZCoord->GetString().isEmpty()))); - emit vertexDefined(enfVertexIsDefined); + Q_EMIT vertexDefined(enfVertexIsDefined); } /** @@ -754,7 +754,7 @@ void HYBRIDPluginGUI_HypothesisCreator::checkVertexIsDefined() **/ void HYBRIDPluginGUI_HypothesisCreator::checkEnfMeshIsDefined() { - emit enfMeshDefined( myEnfVertexWdg->NbObjects() != 0); + Q_EMIT enfMeshDefined( myEnfVertexWdg->NbObjects() != 0); } /** @@ -1382,7 +1382,7 @@ void HYBRIDPluginGUI_HypothesisCreator::onRemoveEnforcedMesh() QList selectedItems = myEnforcedMeshTableWidget->selectedItems(); QTableWidgetItem* item; int row; - foreach( item, selectedItems ) { + Q_FOREACH( item, selectedItems ) { row = item->row(); if (!selectedRows.contains( row ) ) selectedRows.append(row); @@ -1409,7 +1409,7 @@ void HYBRIDPluginGUI_HypothesisCreator::onRemoveEnforcedVertex() QList selectedItems = myEnforcedTableWidget->selectedItems(); QTableWidgetItem* item; int row; - foreach( item, selectedItems ) { + Q_FOREACH( item, selectedItems ) { row = item->row(); if (!selectedRows.contains( row ) ) selectedRows.append(row); diff --git a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.h b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.h index 9014cbd..d5418f5 100644 --- a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.h +++ b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.h @@ -187,7 +187,7 @@ protected: virtual QPixmap icon() const; virtual QString type() const; -protected slots: +protected Q_SLOTS: void onToMeshHoles(bool); void onDirBtnClicked(); void updateWidgets(); @@ -210,7 +210,7 @@ protected slots: //void synchronizeEnforcedMesh(); void checkEnfMeshIsDefined(); -signals: +Q_SIGNALS: void vertexDefined(bool); void enfMeshDefined(bool); -- 2.39.2