diff options
author | David Robillard <d@drobilla.net> | 2007-09-20 00:23:14 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-09-20 00:23:14 +0000 |
commit | 0a9c38574cafd3e77234d220a18241025098bbb3 (patch) | |
tree | bf4380ab3b4bb42d1eff4263d5e559d43a6ccbc4 /src/libs/gui | |
parent | ad558bdafde7e40b5de79b47d8586aec53cf3f7e (diff) | |
download | ingen-0a9c38574cafd3e77234d220a18241025098bbb3.tar.gz ingen-0a9c38574cafd3e77234d220a18241025098bbb3.tar.bz2 ingen-0a9c38574cafd3e77234d220a18241025098bbb3.zip |
Rename C++ signals to cleaner Gtkmm convention.
git-svn-id: http://svn.drobilla.net/lad/ingen@734 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui')
-rw-r--r-- | src/libs/gui/ConnectWindow.cpp | 2 | ||||
-rw-r--r-- | src/libs/gui/ControlGroups.cpp | 2 | ||||
-rw-r--r-- | src/libs/gui/NodeMenu.cpp | 2 | ||||
-rw-r--r-- | src/libs/gui/NodeModule.cpp | 10 | ||||
-rw-r--r-- | src/libs/gui/PatchCanvas.cpp | 12 | ||||
-rw-r--r-- | src/libs/gui/PatchPortModule.cpp | 2 | ||||
-rw-r--r-- | src/libs/gui/PatchTreeWindow.cpp | 6 | ||||
-rw-r--r-- | src/libs/gui/PatchView.cpp | 6 | ||||
-rw-r--r-- | src/libs/gui/PatchWindow.cpp | 4 | ||||
-rw-r--r-- | src/libs/gui/Port.cpp | 6 | ||||
-rw-r--r-- | src/libs/gui/PortPropertiesWindow.cpp | 2 |
11 files changed, 27 insertions, 27 deletions
diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp index 333d0454..e61b72d8 100644 --- a/src/libs/gui/ConnectWindow.cpp +++ b/src/libs/gui/ConnectWindow.cpp @@ -352,7 +352,7 @@ ConnectWindow::gtk_callback() _progress_label->set_text("Connecting to engine..."); present(); - App::instance().client()->response_ok_sig.connect( + App::instance().client()->signal_response_ok.connect( sigc::mem_fun(this, &ConnectWindow::response_ok_received)); _ping_id = rand(); diff --git a/src/libs/gui/ControlGroups.cpp b/src/libs/gui/ControlGroups.cpp index 2e31ed3f..46052d72 100644 --- a/src/libs/gui/ControlGroups.cpp +++ b/src/libs/gui/ControlGroups.cpp @@ -64,7 +64,7 @@ ControlGroup::init(ControlPanel* panel, SharedPtr<PortModel> pm) assert(_port_model); assert(panel); - _control_connection = pm->control_change_sig.connect(sigc::mem_fun(this, &ControlGroup::set_value)); + _control_connection = pm->signal_control.connect(sigc::mem_fun(this, &ControlGroup::set_value)); } diff --git a/src/libs/gui/NodeMenu.cpp b/src/libs/gui/NodeMenu.cpp index 9f99cfe3..4b00a13b 100644 --- a/src/libs/gui/NodeMenu.cpp +++ b/src/libs/gui/NodeMenu.cpp @@ -85,7 +85,7 @@ NodeMenu::NodeMenu(SharedPtr<NodeModel> node) _polyphonic_menuitem = static_cast<Gtk::RadioMenuItem*>(&items().back()); _polyphonic_menuitem->set_active(node->polyphonic()); - node->polyphonic_sig.connect(sigc::mem_fun(this, &NodeMenu::polyphonic_changed)); + node->signal_polyphonic.connect(sigc::mem_fun(this, &NodeMenu::polyphonic_changed)); _enable_signal = true; diff --git a/src/libs/gui/NodeModule.cpp b/src/libs/gui/NodeModule.cpp index 9cba9abd..189f1d2d 100644 --- a/src/libs/gui/NodeModule.cpp +++ b/src/libs/gui/NodeModule.cpp @@ -42,11 +42,11 @@ NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeMode { assert(_node); - node->new_port_sig.connect(sigc::bind(sigc::mem_fun(this, &NodeModule::add_port), true)); - node->removed_port_sig.connect(sigc::mem_fun(this, &NodeModule::remove_port)); - node->metadata_update_sig.connect(sigc::mem_fun(this, &NodeModule::set_metadata)); - node->polyphonic_sig.connect(sigc::mem_fun(this, &NodeModule::set_stacked_border)); - node->renamed_sig.connect(sigc::mem_fun(this, &NodeModule::rename)); + node->signal_new_port.connect(sigc::bind(sigc::mem_fun(this, &NodeModule::add_port), true)); + node->signal_removed_port.connect(sigc::mem_fun(this, &NodeModule::remove_port)); + node->signal_metadata.connect(sigc::mem_fun(this, &NodeModule::set_metadata)); + node->signal_polyphonic.connect(sigc::mem_fun(this, &NodeModule::set_stacked_border)); + node->signal_renamed.connect(sigc::mem_fun(this, &NodeModule::rename)); signal_clicked.connect(sigc::mem_fun(this, &NodeModule::on_click)); diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp index 252e0984..0992ba81 100644 --- a/src/libs/gui/PatchCanvas.cpp +++ b/src/libs/gui/PatchCanvas.cpp @@ -108,12 +108,12 @@ PatchCanvas::PatchCanvas(SharedPtr<PatchModel> patch, int width, int height) #endif // Connect to model signals to track state - _patch->new_node_sig.connect(sigc::mem_fun(this, &PatchCanvas::add_node)); - _patch->removed_node_sig.connect(sigc::mem_fun(this, &PatchCanvas::remove_node)); - _patch->new_port_sig.connect(sigc::mem_fun(this, &PatchCanvas::add_port)); - _patch->removed_port_sig.connect(sigc::mem_fun(this, &PatchCanvas::remove_port)); - _patch->new_connection_sig.connect(sigc::mem_fun(this, &PatchCanvas::connection)); - _patch->removed_connection_sig.connect(sigc::mem_fun(this, &PatchCanvas::disconnection)); + _patch->signal_new_node.connect(sigc::mem_fun(this, &PatchCanvas::add_node)); + _patch->signal_removed_node.connect(sigc::mem_fun(this, &PatchCanvas::remove_node)); + _patch->signal_new_port.connect(sigc::mem_fun(this, &PatchCanvas::add_port)); + _patch->signal_removed_port.connect(sigc::mem_fun(this, &PatchCanvas::remove_port)); + _patch->signal_new_connection.connect(sigc::mem_fun(this, &PatchCanvas::connection)); + _patch->signal_removed_connection.connect(sigc::mem_fun(this, &PatchCanvas::disconnection)); // Connect widget signals to do things _menu_load_plugin->signal_activate().connect(sigc::mem_fun(this, &PatchCanvas::menu_load_plugin)); diff --git a/src/libs/gui/PatchPortModule.cpp b/src/libs/gui/PatchPortModule.cpp index 15ce9ac4..e07f403c 100644 --- a/src/libs/gui/PatchPortModule.cpp +++ b/src/libs/gui/PatchPortModule.cpp @@ -60,7 +60,7 @@ PatchPortModule::PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, SharedPt move_to(default_x, default_y); }*/ - port->metadata_update_sig.connect(sigc::mem_fun(this, &PatchPortModule::metadata_update)); + port->signal_metadata.connect(sigc::mem_fun(this, &PatchPortModule::metadata_update)); } diff --git a/src/libs/gui/PatchTreeWindow.cpp b/src/libs/gui/PatchTreeWindow.cpp index bdd293ac..595c83b8 100644 --- a/src/libs/gui/PatchTreeWindow.cpp +++ b/src/libs/gui/PatchTreeWindow.cpp @@ -68,7 +68,7 @@ PatchTreeWindow::PatchTreeWindow(BaseObjectType* cobject, void PatchTreeWindow::init(Store& store) { - store.new_object_sig.connect(sigc::mem_fun(this, &PatchTreeWindow::new_object)); + store.signal_new_object.connect(sigc::mem_fun(this, &PatchTreeWindow::new_object)); } @@ -115,8 +115,8 @@ PatchTreeWindow::add_patch(SharedPtr<PatchModel> pm) } } - pm->enabled_sig.connect(sigc::bind(sigc::mem_fun(this, &PatchTreeWindow::patch_enabled), pm->path())); - pm->disabled_sig.connect(sigc::bind(sigc::mem_fun(this, &PatchTreeWindow::patch_disabled), pm->path())); + pm->signal_enabled.connect(sigc::bind(sigc::mem_fun(this, &PatchTreeWindow::patch_enabled), pm->path())); + pm->signal_disabled.connect(sigc::bind(sigc::mem_fun(this, &PatchTreeWindow::patch_disabled), pm->path())); } diff --git a/src/libs/gui/PatchView.cpp b/src/libs/gui/PatchView.cpp index c313f5ac..12005adb 100644 --- a/src/libs/gui/PatchView.cpp +++ b/src/libs/gui/PatchView.cpp @@ -76,8 +76,8 @@ PatchView::set_patch(SharedPtr<PatchModel> patch) patch->enabled() ? enable() : disable(); // Connect model signals to track state - patch->enabled_sig.connect(sigc::mem_fun(this, &PatchView::enable)); - patch->disabled_sig.connect(sigc::mem_fun(this, &PatchView::disable)); + patch->signal_enabled.connect(sigc::mem_fun(this, &PatchView::enable)); + patch->signal_disabled.connect(sigc::mem_fun(this, &PatchView::disable)); // Connect widget signals to do things _process_but->signal_toggled().connect(sigc::mem_fun(this, &PatchView::process_toggled)); @@ -90,7 +90,7 @@ PatchView::set_patch(SharedPtr<PatchModel> patch) _zoom_full_but->signal_clicked().connect( sigc::mem_fun(_canvas.get(), &PatchCanvas::zoom_full)); - patch->editable_sig.connect(sigc::mem_fun( + patch->signal_editable.connect(sigc::mem_fun( *this, &PatchView::on_editable_sig)); _edit_mode_but->signal_toggled().connect(sigc::mem_fun( diff --git a/src/libs/gui/PatchWindow.cpp b/src/libs/gui/PatchWindow.cpp index ceeff852..c3e9149f 100644 --- a/src/libs/gui/PatchWindow.cpp +++ b/src/libs/gui/PatchWindow.cpp @@ -227,8 +227,8 @@ PatchWindow::set_patch(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view) else _menu_destroy_patch->set_sensitive(true); - new_port_connection = patch->new_port_sig.connect(sigc::mem_fun(this, &PatchWindow::patch_port_added)); - removed_port_connection = patch->removed_port_sig.connect(sigc::mem_fun(this, &PatchWindow::patch_port_removed)); + new_port_connection = patch->signal_new_port.connect(sigc::mem_fun(this, &PatchWindow::patch_port_added)); + removed_port_connection = patch->signal_removed_port.connect(sigc::mem_fun(this, &PatchWindow::patch_port_removed)); show_all(); _enable_signal = true; diff --git a/src/libs/gui/Port.cpp b/src/libs/gui/Port.cpp index 455f9e8c..d5272878 100644 --- a/src/libs/gui/Port.cpp +++ b/src/libs/gui/Port.cpp @@ -48,7 +48,7 @@ Port::Port(boost::shared_ptr<FlowCanvas::Module> module, SharedPtr<PortModel> pm _menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Destroy", sigc::mem_fun(this, &Port::on_menu_destroy))); - _port_model->renamed_sig.connect(sigc::mem_fun(this, &Port::renamed)); + _port_model->signal_renamed.connect(sigc::mem_fun(this, &Port::renamed)); if (pm->is_control()) { show_control(); @@ -61,8 +61,8 @@ Port::Port(boost::shared_ptr<FlowCanvas::Module> module, SharedPtr<PortModel> pm set_control_min(min); set_control_max(max); - pm->metadata_update_sig.connect(sigc::mem_fun(this, &Port::metadata_update)); - _port_model->control_change_sig.connect(sigc::mem_fun(this, &Port::control_changed)); + pm->signal_metadata.connect(sigc::mem_fun(this, &Port::metadata_update)); + _port_model->signal_control.connect(sigc::mem_fun(this, &Port::control_changed)); } control_changed(_port_model->value()); diff --git a/src/libs/gui/PortPropertiesWindow.cpp b/src/libs/gui/PortPropertiesWindow.cpp index 3d69e648..cf8dbd98 100644 --- a/src/libs/gui/PortPropertiesWindow.cpp +++ b/src/libs/gui/PortPropertiesWindow.cpp @@ -75,7 +75,7 @@ PortPropertiesWindow::init(ControlGroup* control, SharedPtr<PortModel> pm) _max_spinner->set_value(max); _max_spinner->signal_value_changed().connect(sigc::mem_fun(*this, &PortPropertiesWindow::max_changed)); - pm->metadata_update_sig.connect(sigc::mem_fun(this, &PortPropertiesWindow::metadata_update)); + pm->signal_metadata.connect(sigc::mem_fun(this, &PortPropertiesWindow::metadata_update)); _enable_signal = true; } |