From e76b37d8fed610c6c689b2d919fab0ce1f0f75ac Mon Sep 17 00:00:00 2001 From: imn Date: Wed, 17 Sep 2014 13:40:06 +0400 Subject: [PATCH] Removed qt3 support and replaced qt macros --- src/genericgui/BL_CreateJobWizard.cxx | 4 ++-- src/genericgui/BL_CreateJobWizard.hxx | 16 ++++++++-------- src/genericgui/BL_GenericGui.hxx | 2 +- src/genericgui/BL_JobTab.hxx | 2 +- src/genericgui/BL_JobsManager_QT.cxx | 8 ++++---- src/genericgui/BL_JobsManager_QT.hxx | 4 ++-- src/genericgui/BL_JobsTable.hxx | 2 +- src/genericgui/BL_QModelManager.hxx | 2 +- src/genericgui/BL_Summary.hxx | 2 +- src/genericgui/JM_EditSalomeResource.hxx | 2 +- src/genericgui/JM_ResourceCatalog.hxx | 2 +- src/salomegui/BL_SalomeGui.hxx | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx index 6ff0fe2..8feba47 100644 --- 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 28f1585..6f5e7ae 100644 --- 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 cf5d4b7..45736c5 100644 --- 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 bc953e0..8259ece 100644 --- 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 47171ed..d9f656d 100644 --- 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 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 a57a558..14a54db 100644 --- 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 77b28ee..2a8511b 100644 --- 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 4b4e3f4..6fef9be 100644 --- 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 63a306f..84de450 100644 --- 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 6bf31fa..c9a2e97 100644 --- 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 05bef79..dacf1a9 100644 --- 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 3b7fac4..649b48f 100644 --- 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& 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: -- 2.39.2