Make signals private with accessors, and localise dependency on sigc::signal.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3258 a436a847-0d15-0410-975c-d299462d15a1

15 files changed, 74 insertions, 58 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 7c15701e..9d3fc49a 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -174,8 +174,10 @@ App::attach(SharedPtr<SigClientInterface> client,
 
 	_patch_tree_window->init(*_store);
 
-	_client->signal_response_error.connect(sigc::mem_fun(this, &App::error_response));
-	_client->signal_error.connect(sigc::mem_fun(this, &App::error_message));
+	_client->signal_response_error().connect(
+		sigc::mem_fun(this, &App::error_response));
+	_client->signal_error().connect(
+		sigc::mem_fun(this, &App::error_message));
 }
 
 void
diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index e7e7e356..6e7f9b39 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -31,7 +31,7 @@ BreadCrumbs::BreadCrumbs()
 	, _full_path("/")
 	, _enable_signal(true)
 {
-	App::instance().client()->signal_object_deleted.connect(
+	App::instance().client()->signal_object_deleted().connect(
 			sigc::mem_fun(this, &BreadCrumbs::object_destroyed));
 }
 
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index cc7b6d7c..7741be10 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -397,7 +397,7 @@ ConnectWindow::gtk_callback()
 	timeval now;
 	gettimeofday(&now, NULL);
 	static const timeval start = now;
-	static timeval last = now;
+	static timeval       last  = now;
 
 	// Show if attempted connection goes on for a noticeable amount of time
 	if (!is_visible()) {
@@ -411,7 +411,7 @@ ConnectWindow::gtk_callback()
 
 	if (_connect_stage == 0) {
 		_attached = false;
-		App::instance().client()->signal_response_ok.connect(
+		App::instance().client()->signal_response_ok().connect(
 				sigc::mem_fun(this, &ConnectWindow::on_response));
 
 		_ping_id = abs(rand()) / 2 * 2; // avoid -1
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index 9322fd77..153f1c26 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -69,7 +69,8 @@ Control::init(ControlPanel* panel, SharedPtr<PortModel> pm)
 	assert(panel);
 
 	_control_connection.disconnect();
-	_control_connection = pm->signal_value_changed.connect(sigc::mem_fun(this, &Control::set_value));
+	_control_connection = pm->signal_value_changed().connect(
+		sigc::mem_fun(this, &Control::set_value));
 
 	boost::shared_ptr<NodeModel> parent = PtrCast<NodeModel>(_port_model->parent());
 	if (parent)
@@ -160,7 +161,8 @@ SliderControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
 		_slider->set_increments(0, 0);
 	}
 
-	pm->signal_property.connect(sigc::mem_fun(this, &SliderControl::port_property_changed));
+	pm->signal_property().connect(
+		sigc::mem_fun(this, &SliderControl::port_property_changed));
 
 	_slider->set_range(std::min(min, pm->value().get_float()), std::max(max, pm->value().get_float()));
 
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index d305e4fb..66868f18 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -174,7 +174,7 @@ void
 LoadPluginWindow::on_show()
 {
 	if (!_has_shown) {
-		App::instance().store()->signal_new_plugin.connect(
+		App::instance().store()->signal_new_plugin().connect(
 				sigc::mem_fun(this, &LoadPluginWindow::add_plugin));
 		_has_shown = true;
 	}
@@ -253,9 +253,9 @@ LoadPluginWindow::add_plugin(SharedPtr<PluginModel> plugin)
 
 	set_row(row, plugin);
 
-	plugin->signal_property.connect(sigc::bind<0>(
-			sigc::mem_fun(this, &LoadPluginWindow::plugin_property_changed),
-			plugin->uri()));
+	plugin->signal_property().connect(
+		sigc::bind<0>(sigc::mem_fun(this, &LoadPluginWindow::plugin_property_changed),
+		              plugin->uri()));
 }
 
 ///// Event Handlers //////
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 497d0461..5a6e8b44 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -52,18 +52,19 @@ NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeMode
 {
 	assert(_node);
 
-	node->signal_new_port.connect(
+	node->signal_new_port().connect(
 		sigc::bind(sigc::mem_fun(this, &NodeModule::add_port), true));
-	node->signal_removed_port.connect(
+	node->signal_removed_port().connect(
 		sigc::hide_return(sigc::mem_fun(this, &NodeModule::remove_port)));
-	node->signal_property.connect(
+	node->signal_property().connect(
 		sigc::mem_fun(this, &NodeModule::property_changed));
-	node->signal_moved.connect(
+	node->signal_moved().connect(
 		sigc::mem_fun(this, &NodeModule::rename));
 
 	PluginModel* plugin = dynamic_cast<PluginModel*>(node->plugin());
 	if (plugin) {
-		plugin->signal_changed.connect(sigc::mem_fun(this, &NodeModule::plugin_changed));
+		plugin->signal_changed().connect(
+			sigc::mem_fun(this, &NodeModule::plugin_changed));
 	}
 }
 
@@ -256,8 +257,9 @@ NodeModule::add_port(SharedPtr<PortModel> port, bool resize_to_fit)
 	Module::add_port(Port::create(PtrCast<NodeModule>(shared_from_this()), port,
 			App::instance().configuration()->name_style() == Configuration::HUMAN));
 
-	port->signal_value_changed.connect(sigc::bind<0>(
-			sigc::mem_fun(this, &NodeModule::value_changed), port->index()));
+	port->signal_value_changed().connect(
+		sigc::bind<0>(sigc::mem_fun(this, &NodeModule::value_changed),
+		              port->index()));
 
 	if (resize_to_fit)
 		resize();
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index d8a5e426..82822d57 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -78,7 +78,7 @@ ObjectMenu::init(SharedPtr<ObjectModel> object)
 	_properties_menuitem->signal_activate().connect(
 			sigc::mem_fun(this, &ObjectMenu::on_menu_properties));
 
-	object->signal_property.connect(sigc::mem_fun(this, &ObjectMenu::property_changed));
+	object->signal_property().connect(sigc::mem_fun(this, &ObjectMenu::property_changed));
 
 	_learn_menuitem->hide();
 	_unlearn_menuitem->hide();
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 91120448..1215b957 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -107,20 +107,20 @@ PatchCanvas::PatchCanvas(SharedPtr<PatchModel> patch, int width, int height)
 			"event_out", "Event Out", "http://lv2plug.in/ns/ext/event#EventPort", true));
 
 	// Connect to model signals to track state
-	_patch->signal_new_node.connect(
+	_patch->signal_new_node().connect(
 		sigc::mem_fun(this, &PatchCanvas::add_node));
-	_patch->signal_removed_node.connect(
+	_patch->signal_removed_node().connect(
 		sigc::mem_fun(this, &PatchCanvas::remove_node));
-	_patch->signal_new_port.connect(
+	_patch->signal_new_port().connect(
 		sigc::mem_fun(this, &PatchCanvas::add_port));
-	_patch->signal_removed_port.connect(
+	_patch->signal_removed_port().connect(
 		sigc::mem_fun(this, &PatchCanvas::remove_port));
-	_patch->signal_new_connection.connect(
+	_patch->signal_new_connection().connect(
 		sigc::mem_fun(this, &PatchCanvas::connection));
-	_patch->signal_removed_connection.connect(
+	_patch->signal_removed_connection().connect(
 		sigc::mem_fun(this, &PatchCanvas::disconnection));
 
-	App::instance().store()->signal_new_plugin.connect(
+	App::instance().store()->signal_new_plugin().connect(
 		sigc::mem_fun(this, &PatchCanvas::add_plugin));
 
 	// Connect widget signals to do things
@@ -133,7 +133,7 @@ PatchCanvas::PatchCanvas(SharedPtr<PatchModel> patch, int width, int height)
 	_menu_edit->signal_activate().connect(
 		sigc::mem_fun(this, &PatchCanvas::menu_edit_toggled));
 
-	_patch->signal_editable.connect(
+	_patch->signal_editable().connect(
 		sigc::mem_fun(this, &PatchCanvas::patch_editable_changed));
 }
 
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 51dd064a..998e8a97 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -49,7 +49,8 @@ PatchPortModule::PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, SharedPt
 
 	set_stacked_border(model->polyphonic());
 
-	model->signal_property.connect(sigc::mem_fun(this, &PatchPortModule::property_changed));
+	model->signal_property().connect(
+		sigc::mem_fun(this, &PatchPortModule::property_changed));
 }
 
 boost::shared_ptr<PatchPortModule>
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index adb41a13..f4fb69b6 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -70,7 +70,8 @@ PatchTreeWindow::PatchTreeWindow(BaseObjectType*                        cobject,
 void
 PatchTreeWindow::init(ClientStore& store)
 {
-	store.signal_new_object.connect(sigc::mem_fun(this, &PatchTreeWindow::new_object));
+	store.signal_new_object().connect(
+		sigc::mem_fun(this, &PatchTreeWindow::new_object));
 }
 
 void
@@ -109,17 +110,17 @@ PatchTreeWindow::add_patch(SharedPtr<PatchModel> pm)
 		}
 	}
 
-	pm->signal_property.connect(sigc::bind(
-			sigc::mem_fun(this, &PatchTreeWindow::patch_property_changed),
-			pm));
+	pm->signal_property().connect(
+		sigc::bind(sigc::mem_fun(this, &PatchTreeWindow::patch_property_changed),
+		           pm));
 
-	pm->signal_moved.connect(sigc::bind(
-		sigc::mem_fun(this, &PatchTreeWindow::patch_moved),
-		pm));
+	pm->signal_moved().connect(
+		sigc::bind(sigc::mem_fun(this, &PatchTreeWindow::patch_moved),
+		           pm));
 
-	pm->signal_destroyed.connect(sigc::bind(
-		sigc::mem_fun(this, &PatchTreeWindow::remove_patch),
-		pm));
+	pm->signal_destroyed().connect(
+		sigc::bind(sigc::mem_fun(this, &PatchTreeWindow::remove_patch),
+		           pm));
 }
 
 void
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index afe73048..65c3566a 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -80,11 +80,14 @@ PatchView::set_patch(SharedPtr<PatchModel> patch)
 		property_changed(i->first, i->second);
 
 	// Connect model signals to track state
-	patch->signal_property.connect(sigc::mem_fun(this, &PatchView::property_changed));
+	patch->signal_property().connect(
+		sigc::mem_fun(this, &PatchView::property_changed));
 
 	// Connect widget signals to do things
-	_process_but->signal_toggled().connect(sigc::mem_fun(this, &PatchView::process_toggled));
-	_refresh_but->signal_clicked().connect(sigc::mem_fun(this, &PatchView::refresh_clicked));
+	_process_but->signal_toggled().connect(
+		sigc::mem_fun(this, &PatchView::process_toggled));
+	_refresh_but->signal_clicked().connect(
+		sigc::mem_fun(this, &PatchView::refresh_clicked));
 
 	_zoom_normal_but->signal_clicked().connect(sigc::bind(sigc::mem_fun(
 		_canvas.get(), &PatchCanvas::set_zoom), 1.0));
@@ -92,7 +95,7 @@ PatchView::set_patch(SharedPtr<PatchModel> patch)
 	_zoom_full_but->signal_clicked().connect(
 		sigc::mem_fun(_canvas.get(), &PatchCanvas::zoom_full));
 
-	patch->signal_editable.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/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index cd97e3e3..ab8fcfd9 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -255,12 +255,12 @@ PatchWindow::set_patch(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view)
 
 	set_title(_patch->path().chop_scheme() + " - Ingen");
 
-	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));
-	removed_port_connection = patch->signal_editable.connect(
-			sigc::mem_fun(this, &PatchWindow::editable_changed));
+	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));
+	removed_port_connection = patch->signal_editable().connect(
+		sigc::mem_fun(this, &PatchWindow::editable_changed));
 
 	show_all();
 
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index ba28078d..afb46f4d 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -85,16 +85,18 @@ Port::Port(
 	_rect->property_dash() = dash;
 	set_border_width(dash ? 2.0 : 0.0);
 
-	pm->signal_moved.connect(sigc::mem_fun(this, &Port::moved));
+	pm->signal_moved().connect(sigc::mem_fun(this, &Port::moved));
 
 	if (App::instance().can_control(pm.get())) {
 		set_toggled(pm->is_toggle());
 		show_control();
-		pm->signal_property.connect(sigc::mem_fun(this, &Port::property_changed));
-		pm->signal_value_changed.connect(sigc::mem_fun(this, &Port::value_changed));
+		pm->signal_property().connect(
+			sigc::mem_fun(this, &Port::property_changed));
+		pm->signal_value_changed().connect(
+			sigc::mem_fun(this, &Port::value_changed));
 	}
 
-	pm->signal_activity.connect(sigc::mem_fun(this, &Port::activity));
+	pm->signal_activity().connect(sigc::mem_fun(this, &Port::activity));
 
 	update_metadata();
 
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 23d38ac9..3258c480 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -75,14 +75,17 @@ PortPropertiesWindow::present(SharedPtr<PortModel> pm)
 	_initial_max = max;
 
 	_min_spinner->set_value(min);
-	_connections.push_back(_min_spinner->signal_value_changed().connect(
-				sigc::mem_fun(*this, &PortPropertiesWindow::min_changed)));
+	_connections.push_back(
+		_min_spinner->signal_value_changed().connect(
+			sigc::mem_fun(*this, &PortPropertiesWindow::min_changed)));
 
 	_max_spinner->set_value(max);
-	_connections.push_back(_max_spinner->signal_value_changed().connect(
-				sigc::mem_fun(*this, &PortPropertiesWindow::max_changed)));
+	_connections.push_back(
+		_max_spinner->signal_value_changed().connect(
+			sigc::mem_fun(*this, &PortPropertiesWindow::max_changed)));
 
-	_connections.push_back(pm->signal_property.connect(
+	_connections.push_back(
+		pm->signal_property().connect(
 			sigc::mem_fun(this, &PortPropertiesWindow::property_changed)));
 
 	Gtk::Window::present();
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 1a1e5fab..491a255e 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -122,7 +122,7 @@ PropertiesWindow::set_object(SharedPtr<ObjectModel> model)
 
 	_table->show_all();
 
-	_property_connection = model->signal_property.connect(
+	_property_connection = model->signal_property().connect(
 			sigc::mem_fun(this, &PropertiesWindow::property_changed));
 }