diff --git a/administrator/source/linux/MABackupPanel.cc b/administrator/source/linux/MABackupPanel.cc index 2c1bf10..8913f63 100755 --- a/administrator/source/linux/MABackupPanel.cc +++ b/administrator/source/linux/MABackupPanel.cc @@ -1282,7 +1282,7 @@ void MABackupPanel::perform_backup() if (_inst->check_connection()) { - SigC::Connection con= Glib::signal_timeout().connect(sigc::bind + sigc::connection con= Glib::signal_timeout().connect(sigc::bind (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata), 50); dlg->show(); diff --git a/administrator/source/linux/MACatalogsPanel.cc b/administrator/source/linux/MACatalogsPanel.cc index 91957a6..93915b5 100755 --- a/administrator/source/linux/MACatalogsPanel.cc +++ b/administrator/source/linux/MACatalogsPanel.cc @@ -1488,7 +1488,7 @@ void MACatalogsPanel::maint_next_page() _maint_dlg_xml->get_button("next_button")->set_sensitive(false); _maint_dlg_xml->get_note("note")->set_current_page(4); - SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); + sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); status= (MYX_TABLE_COMMAND_STATUSES*) _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table, @@ -1528,7 +1528,7 @@ void MACatalogsPanel::maint_next_page() _maint_dlg_xml->get_button("next_button")->set_sensitive(false); _maint_dlg_xml->get_note("note")->set_current_page(4); - SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); + sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); status= (MYX_TABLE_COMMAND_STATUSES*) _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table, @@ -1568,7 +1568,7 @@ void MACatalogsPanel::maint_next_page() _maint_dlg_xml->get_button("next_button")->set_sensitive(false); _maint_dlg_xml->get_note("note")->set_current_page(4); - SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); + sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); status= (MYX_TABLE_COMMAND_STATUSES*) _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table, diff --git a/administrator/source/linux/MARestorePanel.cc b/administrator/source/linux/MARestorePanel.cc index 708cadd..ef59e33 100755 --- a/administrator/source/linux/MARestorePanel.cc +++ b/administrator/source/linux/MARestorePanel.cc @@ -728,7 +728,7 @@ MYX_BACKUP_CONTENT *MARestorePanel::perform_load(const std::string &file, op_aborted= false; { - SigC::Connection con= Glib::signal_timeout().connect(sigc::bind + sigc::connection con= Glib::signal_timeout().connect(sigc::bind (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata), 50); @@ -854,7 +854,7 @@ void MARestorePanel::perform_restore() //{ MYX_BACKUP_ERROR err; - SigC::Connection con= Glib::signal_timeout().connect(sigc::bind + sigc::connection con= Glib::signal_timeout().connect(sigc::bind (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata), 50); diff --git a/administrator/source/linux/MAServerConnectionsPanel.h b/administrator/source/linux/MAServerConnectionsPanel.h index 5e28c75..48a54b4 100755 --- a/administrator/source/linux/MAServerConnectionsPanel.h +++ b/administrator/source/linux/MAServerConnectionsPanel.h @@ -87,7 +87,7 @@ class MAServerConnectionsPanel : public MAPanel { Glib::RefPtr _thread_icon; - SigC::Connection _timer; + sigc::connection _timer; int _current_page; diff --git a/administrator/source/linux/MAdministrator.h b/administrator/source/linux/MAdministrator.h index 33086b9..3f87ab8 100755 --- a/administrator/source/linux/MAdministrator.h +++ b/administrator/source/linux/MAdministrator.h @@ -66,7 +66,7 @@ class MAdministrator : public Glib::ObjectBase { sigc::signal0 _signal_prefs_changed; - SigC::Connection _pulse_conn; + sigc::connection _pulse_conn; bool pulse_progress(); void setup_sidebar(); diff --git a/common/source/linux/MGConnectDialog.cc b/common/source/linux/MGConnectDialog.cc index 3168fbe..30ebded 100755 --- a/common/source/linux/MGConnectDialog.cc +++ b/common/source/linux/MGConnectDialog.cc @@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_editor() // select back the original item ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item); - SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this, + sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this, &MGConnectDialog::preferences_closed)); - SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this, + sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this, &MGConnectDialog::preferences_changed)); MGPreferencesEditor::instance()->show(true); MGPreferencesEditor::instance()->set_modal(true); @@ -676,7 +676,7 @@ void MGConnectDialog::show_connection_failed() { Gtk::Button *btn; pid_t ping_pid= 0; - SigC::Connection input_handler; + sigc::connection input_handler; int rc; bool pinging= false; int myerror= 0; diff --git a/common/source/linux/MGTreeTooltip.h b/common/source/linux/MGTreeTooltip.h index 2f3158b..a8c5053 100755 --- a/common/source/linux/MGTreeTooltip.h +++ b/common/source/linux/MGTreeTooltip.h @@ -39,7 +39,7 @@ class MGTreeTooltip : public Glib::Object { WillShowSignal _show_signal; - SigC::Connection _timeout; + sigc::connection _timeout; void expose_event(GdkEventExpose *event); void leave_event(GdkEventCrossing *event); diff --git a/migration-tool/source/linux/GRTEnvironment.cc b/migration-tool/source/linux/GRTEnvironment.cc index 4a4b57d..7adac97 100755 --- a/migration-tool/source/linux/GRTEnvironment.cc +++ b/migration-tool/source/linux/GRTEnvironment.cc @@ -76,7 +76,7 @@ int GRTEnvironment::update_objects() } -void GRTEnvironment::set_shell_output_handler(const SigC::Slot1 &slot) +void GRTEnvironment::set_shell_output_handler(const sigc::slot1 &slot) { _shellOutputHandler= slot; diff --git a/migration-tool/source/linux/GRTEnvironment.h b/migration-tool/source/linux/GRTEnvironment.h index b22bef8..6daa8c8 100755 --- a/migration-tool/source/linux/GRTEnvironment.h +++ b/migration-tool/source/linux/GRTEnvironment.h @@ -28,7 +28,7 @@ class GRTEnvironment { int _msgOffset; std::vector _sourceObjectNames; - SigC::Slot1 _shellOutputHandler; + sigc::slot1 _shellOutputHandler; static void process_shell_output(const char *text, void *udata); @@ -42,7 +42,7 @@ class GRTEnvironment { int init_jni(const std::string &classpath); int execute_shell_command(const Glib::ustring &command); - void set_shell_output_handler(const SigC::Slot1 &slot); + void set_shell_output_handler(const sigc::slot1 &slot); MYX_GRT_OBJ *get_object(const Glib::ustring &name); bool object_implements_interface(MYX_GRT_OBJ *obj, const Glib::ustring &name); diff --git a/migration-tool/source/linux/ObjectShell.cc b/migration-tool/source/linux/ObjectShell.cc index 7b5e8c8..d43b906 100755 --- a/migration-tool/source/linux/ObjectShell.cc +++ b/migration-tool/source/linux/ObjectShell.cc @@ -45,7 +45,7 @@ ObjectShell::ObjectShell(GRTEnvironment *env) tree->set_model(_otree); - tree->get_selection()->signal_changed().connect(SigC::slot(*this,&ObjectShell::object_selected)); + tree->get_selection()->signal_changed().connect(sigc::slot(*this,&ObjectShell::object_selected)); tree= _xml->get_tree("inspector_tree"); @@ -57,9 +57,9 @@ ObjectShell::ObjectShell(GRTEnvironment *env) tree->set_model(_ilist); - _xml->get_text("shell_text")->signal_key_press_event().connect(SigC::slot(*this,&ObjectShell::shell_key_press), false); + _xml->get_text("shell_text")->signal_key_press_event().connect(sigc::slot(*this,&ObjectShell::shell_key_press), false); - env->set_shell_output_handler(SigC::slot(*this,&ObjectShell::print_shell)); + env->set_shell_output_handler(sigc::slot(*this,&ObjectShell::print_shell)); put_prompt(); } diff --git a/query-browser/source/linux/MQResultTab.h b/query-browser/source/linux/MQResultTab.h index fdcc904..b615001 100755 --- a/query-browser/source/linux/MQResultTab.h +++ b/query-browser/source/linux/MQResultTab.h @@ -45,7 +45,7 @@ class MQResultTab : public MQBaseTab { Gtk::Paned *paned; - SigC::Connection scroll_con; + sigc::connection scroll_con; }; enum CompareAction { @@ -71,7 +71,7 @@ class MQResultTab : public MQBaseTab { bool _vertical; - SigC::Connection _sync_con1, _sync_con2; + sigc::connection _sync_con1, _sync_con2; void scrolled(MQResultSetView *sender); void activated(MQResultSetView *sender);