Removed qt3 support and replaced qt macros

diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx
index 6ff0fe2dd004ccb47cd50992e347fb98c739bfee..8feba47db34bba23faa7c28099992304c246ce17 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.cxx
+++ b/src/genericgui/BL_CreateJobWizard.cxx
@@ -1014,7 +1014,7 @@ FilesPage::add_output_file()
   QListWidgetItem * new_item = new QListWidgetItem("TO EDIT!");
   new_item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEditable|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
   ui->output_files_list->addItem(new_item);
-  emit completeChanged();
+  Q_EMIT completeChanged();
 }
 
 void 
@@ -1026,7 +1026,7 @@ FilesPage::remove_output_files()
     int row = ui->output_files_list->row( list.at(i) );
     delete ui->output_files_list->takeItem(row);
   }
-  emit completeChanged();
+  Q_EMIT completeChanged();
 }
 
 void 

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index 28f1585eb4136b1c8741399e5abda9e88c76eab6..6f5e7ae03a790667f1936270a6c65257cb528507 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -51,7 +51,7 @@ namespace BL{
 
       void clone(const std::string & name);
 
-    public slots:
+    public Q_SLOTS:
       void end(int result);
 
     private:
@@ -123,7 +123,7 @@ namespace BL{
       virtual int nextId() const ;
       virtual void cleanupPage() {}
 
-    public slots:
+    public Q_SLOTS:
       void yacs_schema_button(bool checked);
       void command_button(bool checked);
       void python_salome_button(bool checked);
@@ -190,7 +190,7 @@ namespace BL{
       virtual void cleanupPage();
       virtual void initializePage();
 
-    public slots:
+    public Q_SLOTS:
       void choose_launcher_file();
 
     private:
@@ -212,7 +212,7 @@ namespace BL{
       virtual bool isComplete() const;
       virtual void cleanupPage() {}
 
-    public slots:
+    public Q_SLOTS:
       void choose_input_files();
       void remove_input_files();
       void input_itemSelectionChanged();
@@ -241,7 +241,7 @@ namespace BL{
       virtual void initializePage();
       virtual void cleanupPage() {}
 
-    public slots:
+    public Q_SLOTS:
       void itemSelected(QListWidgetItem * item);
 
     private:
@@ -266,7 +266,7 @@ namespace BL{
       virtual int nextId() const ;
       virtual void cleanupPage() {}
 
-    public slots:
+    public Q_SLOTS:
       void choose_file();
       void choose_env_file();
 
@@ -287,7 +287,7 @@ namespace BL{
       virtual int nextId() const ;
       virtual void cleanupPage() {}
 
-    public slots:
+    public Q_SLOTS:
       void choose_command_file();
       void choose_env_file();
 
@@ -308,7 +308,7 @@ namespace BL{
       virtual int nextId() const ;
       virtual void cleanupPage() {}
 
-    public slots:
+    public Q_SLOTS:
       void choose_PythonSalome_file();
       void choose_env_file();
 

diff --git a/src/genericgui/BL_GenericGui.hxx b/src/genericgui/BL_GenericGui.hxx
index cf5d4b76f5bfcba0f9f2d0f19ce84f4e3c685f9e..45736c54e03b96eace3ac621b36d56f3910e7aa8 100644 (file)
--- a/src/genericgui/BL_GenericGui.hxx
+++ b/src/genericgui/BL_GenericGui.hxx
@@ -63,7 +63,7 @@ namespace BL
       void reset_job_selection();
 
 
-    public slots:
+    public Q_SLOTS:
       void create_job();
       void edit_clone_job();
       void start_job();

diff --git a/src/genericgui/BL_JobTab.hxx b/src/genericgui/BL_JobTab.hxx
index bc953e0257a0fa0e4f5e22244c5d0f0a28b63477..8259ece01d93ead4a219f10a253962ff5389c5e0 100644 (file)
--- a/src/genericgui/BL_JobTab.hxx
+++ b/src/genericgui/BL_JobTab.hxx
@@ -40,7 +40,7 @@ namespace BL
       void createJobFilesTab();
       void job_selected(const QModelIndex & index);
 
-    public slots:
+    public Q_SLOTS:
       void itemChanged(QStandardItem * item);
       void reset(QString job_name);
 

diff --git a/src/genericgui/BL_JobsManager_QT.cxx b/src/genericgui/BL_JobsManager_QT.cxx
index 47171ed0ff09dd90252d7ec11842cf56b9c38777..d9f656d7d4882040641549f800c41c6fabd35092 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.cxx
+++ b/src/genericgui/BL_JobsManager_QT.cxx
@@ -328,7 +328,7 @@ BL::JobsManager_QT::create_job_with_wizard(BL::CreateJobWizard & wizard)
 
   // End
   addJobToLauncher(wizard.job_name);
-  emit new_job_added(QString::fromUtf8(wizard.job_name.c_str()));
+  Q_EMIT new_job_added(QString::fromUtf8(wizard.job_name.c_str()));
   QStandardItemModel * model = _model_manager->getModel();
   QList<QStandardItem *> item_list = model->findItems(QString::fromUtf8(wizard.job_name.c_str()));
   QStandardItem * job_state_item = model->item(item_list.at(0)->row(), 2);
@@ -399,7 +399,7 @@ BL::JobsManager_QT::event(QEvent * e)
       write_error_text((event->data).c_str());
       write_error_text(" ***\n");
     }
-    emit job_state_changed(job_name);
+    Q_EMIT job_state_changed(job_name);
   }
   else if (event->action == "refresh_job")
   {
@@ -408,7 +408,7 @@ BL::JobsManager_QT::event(QEvent * e)
       QString state((event->data).c_str());
       state = state.toLower();
       write_normal_text("Job " + job_name + " new state is " + state + "\n");
-      emit job_state_changed(job_name);
+      Q_EMIT job_state_changed(job_name);
     }
     else
     {
@@ -520,7 +520,7 @@ BL::JobsManager_QT::event(QEvent * e)
     if (event->event_name == "Ok")
     {
       write_normal_text("New job added " + job_name + "\n");
-      emit new_job_added(job_name);
+      Q_EMIT new_job_added(job_name);
     }
   }
   else if (event->action == "to_remove_job")

diff --git a/src/genericgui/BL_JobsManager_QT.hxx b/src/genericgui/BL_JobsManager_QT.hxx
index a57a55852c4fdbd899902b0df8e176d359eba122..14a54dbc019ff3b6d894e4e829a62f5ffcaf6acb 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.hxx
+++ b/src/genericgui/BL_JobsManager_QT.hxx
@@ -79,7 +79,7 @@ namespace BL{
     protected:
       void create_job_with_wizard(BL::CreateJobWizard & wizard);
 
-    public slots:
+    public Q_SLOTS:
       void RefreshJobs();
       void no_auto_refresh();
       void ten_seconds_refresh();
@@ -91,7 +91,7 @@ namespace BL{
       void load_jobs_button();
       void save_jobs_button();
 
-    signals:
+    Q_SIGNALS:
       void new_job_added(const QString & name);
       void job_state_changed(const QString & name);
 

diff --git a/src/genericgui/BL_JobsTable.hxx b/src/genericgui/BL_JobsTable.hxx
index 77b28ee68ecb36f82582135f62a408ecb68269dc..2a8511b4e16b619a1922369ddf4f086b4c736102 100644 (file)
--- a/src/genericgui/BL_JobsTable.hxx
+++ b/src/genericgui/BL_JobsTable.hxx
@@ -41,7 +41,7 @@ namespace BL
     protected:
       QWidget* _parent;
 
-    protected slots:
+    protected Q_SLOTS:
       void selectionChanged ( const QItemSelection & selected, const QItemSelection & deselected );
       void currentChanged(const QModelIndex & current, const QModelIndex & previous);
 

diff --git a/src/genericgui/BL_QModelManager.hxx b/src/genericgui/BL_QModelManager.hxx
index 4b4e3f4c37c2cc878c23a33fa4aabb843efc5650..6fef9be77a81519d430d78d3f75204bc17309446 100644 (file)
--- a/src/genericgui/BL_QModelManager.hxx
+++ b/src/genericgui/BL_QModelManager.hxx
@@ -39,7 +39,7 @@ namespace BL{
 
       void delete_job(const QString & name);
 
-    public slots:
+    public Q_SLOTS:
       void new_job_added(const QString & name);
       void job_state_changed(const QString & name);
     

diff --git a/src/genericgui/BL_Summary.hxx b/src/genericgui/BL_Summary.hxx
index 63a306f49461b7790ad9bcba2d1934cf6c30b395..84de4508772f0865fbd64ee0db3e22bf782d7906 100644 (file)
--- a/src/genericgui/BL_Summary.hxx
+++ b/src/genericgui/BL_Summary.hxx
@@ -37,7 +37,7 @@ namespace BL
 
       void updateJobs();
 
-    public slots:
+    public Q_SLOTS:
       void rowsInserted(const QModelIndex & parent, int start, int end);
       void rowsRemoved(const QModelIndex & parent, int start, int end);
       void itemChanged(QStandardItem * item);

diff --git a/src/genericgui/JM_EditSalomeResource.hxx b/src/genericgui/JM_EditSalomeResource.hxx
index 6bf31fa9ba1f84cc1c176d5e89a252c0699242a4..c9a2e97edcc7ad2c63319c0d6c6a9ebcf07126b5 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.hxx
+++ b/src/genericgui/JM_EditSalomeResource.hxx
@@ -38,7 +38,7 @@ namespace JM
 
       void get_infos();
 
-    public slots:
+    public Q_SLOTS:
       virtual void accept();
       void add_component();
       void remove_components();

diff --git a/src/genericgui/JM_ResourceCatalog.hxx b/src/genericgui/JM_ResourceCatalog.hxx
index 05bef797cffbdc825bab3bea17879af8ca7d1ffa..dacf1a93d20c97a4cf39ab0e460099a9f515194b 100644 (file)
--- a/src/genericgui/JM_ResourceCatalog.hxx
+++ b/src/genericgui/JM_ResourceCatalog.hxx
@@ -41,7 +41,7 @@ namespace JM
 
       QListWidget * getQListWidget();
 
-    public slots:
+    public Q_SLOTS:
       void refresh_resource_list();
       void item_choosed(QListWidgetItem * item);
       void buttons_management();

diff --git a/src/salomegui/BL_SalomeGui.hxx b/src/salomegui/BL_SalomeGui.hxx
index 3b7fac4d67822731c17cec8959dbdd621ba62e36..649b48f58f819cbba6a14129d7bd08d5cfbbf138 100644 (file)
--- a/src/salomegui/BL_SalomeGui.hxx
+++ b/src/salomegui/BL_SalomeGui.hxx
@@ -52,12 +52,12 @@ namespace BL
       void initialize( CAM_Application* app); // --- Call only once, at GUI module creation
       void windows( QMap<int, int>& theMap) const; // --- Default windows, called each time the module is activated
 
-    public slots:
+    public Q_SLOTS:
       bool deactivateModule( SUIT_Study* theStudy);
       bool activateModule( SUIT_Study* theStudy);
       void studyClosed();
 
-    protected slots:
+    protected Q_SLOTS:
       void onWindowActivated( SUIT_ViewWindow* svw);
 
     protected: