From: imn <imn@opencascade.com>
Date: Wed, 17 Sep 2014 09:34:36 +0000 (+0400)
Subject: Removed qt3 support and replaced qt macros
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fimn%2Fremoved_qt3_support;p=plugins%2Fghs3dplugin.git

Removed qt3 support and replaced qt macros
---

diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
index b368961..246e181 100644
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
@@ -675,7 +675,7 @@ void GHS3DPluginGUI_HypothesisCreator::checkVertexIsDefined()
                        (myEnfVertexWdg->NbObjects() == 0 && !myXCoord->GetString().isEmpty()
                                                          && !myYCoord->GetString().isEmpty()
                                                          && !myZCoord->GetString().isEmpty())));
-  emit vertexDefined(enfVertexIsDefined);
+  Q_EMIT vertexDefined(enfVertexIsDefined);
 }
 
 /** 
@@ -683,7 +683,7 @@ void GHS3DPluginGUI_HypothesisCreator::checkVertexIsDefined()
 **/
 void GHS3DPluginGUI_HypothesisCreator::checkEnfMeshIsDefined()
 {
-  emit enfMeshDefined( myEnfVertexWdg->NbObjects() != 0);
+  Q_EMIT enfMeshDefined( myEnfVertexWdg->NbObjects() != 0);
 }
 
 /** 
@@ -1312,7 +1312,7 @@ void GHS3DPluginGUI_HypothesisCreator::onRemoveEnforcedMesh()
   QList<QTableWidgetItem *> selectedItems = myEnforcedMeshTableWidget->selectedItems();
   QTableWidgetItem* item;
   int row;
-  foreach( item, selectedItems ) {
+  Q_FOREACH( item, selectedItems ) {
     row = item->row();
     if (!selectedRows.contains( row ) )
       selectedRows.append(row);
@@ -1339,7 +1339,7 @@ void GHS3DPluginGUI_HypothesisCreator::onRemoveEnforcedVertex()
   QList<QTableWidgetItem *> 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/GHS3DPluginGUI_HypothesisCreator.h b/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
index 8453f69..5140aff 100644
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
@@ -175,7 +175,7 @@ protected:
   virtual QPixmap  icon() const;
   virtual QString  type() const;
 
-protected slots:
+protected Q_SLOTS:
   void                onToMeshHoles(bool);
   void                onDirBtnClicked();
   void                updateWidgets();
@@ -198,7 +198,7 @@ protected slots:
   //void                synchronizeEnforcedMesh();
   void                checkEnfMeshIsDefined();
   
-signals:
+Q_SIGNALS:
   void                vertexDefined(bool);
   void                enfMeshDefined(bool);