Removed qt3 support and replaced qt macros

diff --git a/src/GUI/BLSURFPluginGUI_Dlg.h b/src/GUI/BLSURFPluginGUI_Dlg.h
index 9b419408d234f21d796642d2e512a687414d18b2..905707133bf9a9d8f3b14e38ade5840f4af5551a 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_Dlg.h
+++ b/src/GUI/BLSURFPluginGUI_Dlg.h
@@ -68,7 +68,7 @@ public:
   BLSURFPluginGUI_StdWidget( QWidget* = 0, Qt::WindowFlags = 0 );
   ~BLSURFPluginGUI_StdWidget();
 
-public slots:
+public Q_SLOTS:
   void onPhysicalMeshChanged();
   void onGeometricMeshChanged();
   void onEditingFinished();
@@ -90,8 +90,8 @@ public:
   BLSURFPluginGUI_AdvWidget( QWidget* = 0, Qt::WindowFlags = 0 );
   ~BLSURFPluginGUI_AdvWidget();
 
-public slots:
+public Q_SLOTS:
   void onChooseGMFFile();
 };
 
-#endif
\ No newline at end of file
+#endif

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index 662fa38e6006fc40c39eb36669fce043b8096c06..d6c47a8484edc9f87eaf09d67a7d8b4a15d0df6b 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -1517,7 +1517,7 @@ void BLSURFPluginGUI_HypothesisCreator::onRemoveEnforcedVertex() {
   QSet<QTreeWidgetItem *> selectedEntries;
   QTreeWidgetItem* item;
 
-  foreach( item, selectedItems ) {
+  Q_FOREACH( item, selectedItems ) {
     QVariant value = item->data(ENF_VER_X_COLUMN, Qt::EditRole);
     if (! value.isNull())
       selectedVertices.append(item);
@@ -1530,7 +1530,7 @@ void BLSURFPluginGUI_HypothesisCreator::onRemoveEnforcedVertex() {
     }
   }
 
-  foreach(item,selectedVertices) {
+  Q_FOREACH(item,selectedVertices) {
     QTreeWidgetItem* parent = item->parent();
 //     MESSAGE("From geometry "<< parent->text(ENF_VER_NAME_COLUMN).toStdString()<<" remove " << item->text(ENF_VER_NAME_COLUMN).toStdString());
     parent->removeChild(item);
@@ -1542,7 +1542,7 @@ void BLSURFPluginGUI_HypothesisCreator::onRemoveEnforcedVertex() {
     }
   }
 
-  foreach(item,selectedEntries) {
+  Q_FOREACH(item,selectedEntries) {
 //     MESSAGE("Remove " << item->text(ENF_VER_NAME_COLUMN).toStdString());
     delete item;
   }
@@ -1646,7 +1646,7 @@ void BLSURFPluginGUI_HypothesisCreator::onRemovePeriodicity() {
   QList<QTreeWidgetItem *> selectedItems = myPeriodicityTreeWidget->selectedItems();
   QTreeWidgetItem* item;
 
-  foreach(item,selectedItems) {
+  Q_FOREACH(item,selectedItems) {
      MESSAGE("Remove " << item->text(0).toStdString());
     delete item;
   }
@@ -2729,7 +2729,7 @@ void BLSURFPluginGUI_HypothesisCreator::onDeleteOption()
   QList<int> selectedRows;
   QList<QTableWidgetItem*> selected = myAdvWidget->myOptionTable->selectedItems();
   QTableWidgetItem* item;
-  foreach( item, selected ) {
+  Q_FOREACH( item, selected ) {
     int row = item->row();
     if ( !selectedRows.contains( row ) ) {
       selectedRows.append( row );

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
index bc3c7a0cc6b1fcd757fe53e28fa501dd084e79e9..511be700712dd36c173955cde12704dce6c927a2 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
@@ -205,7 +205,7 @@ protected:
   virtual QPixmap     icon() const;
   virtual QString     type() const;
 
-protected slots:
+protected Q_SLOTS:
   void                onStateChange();
   // Advanced tab
   void                onAddOption();