Remove Raul::SharedPtr and switch to std::shared_ptr.

Use project local short type aliases for shared_ptr and friends.
Move Raul::Disposable and Raul::Manageable into Raul::Maid.
Use sets to store machina nodes and edges to avoid O(n) searches.


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

1 files changed, 18 insertions, 18 deletions

diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 7e61d48d..7b1ac5c7 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -129,8 +129,8 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType*                   cobject,
 }
 
 void
-LoadPluginWindow::present(SharedPtr<const GraphModel> graph,
-                          Node::Properties            data)
+LoadPluginWindow::present(SPtr<const GraphModel> graph,
+                          Node::Properties       data)
 {
 	set_graph(graph);
 	_initial_data = data;
@@ -170,7 +170,7 @@ LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton*
  * This function MUST be called before using the window in any way!
  */
 void
-LoadPluginWindow::set_graph(SharedPtr<const GraphModel> graph)
+LoadPluginWindow::set_graph(SPtr<const GraphModel> graph)
 {
 	if (_graph) {
 		_graph = graph;
@@ -205,7 +205,7 @@ LoadPluginWindow::on_show()
 }
 
 void
-LoadPluginWindow::set_plugins(SharedPtr<const ClientStore::Plugins> plugins)
+LoadPluginWindow::set_plugins(SPtr<const ClientStore::Plugins> plugins)
 {
 	_rows.clear();
 	_plugins_liststore->clear();
@@ -219,7 +219,7 @@ LoadPluginWindow::set_plugins(SharedPtr<const ClientStore::Plugins> plugins)
 }
 
 void
-LoadPluginWindow::new_plugin(SharedPtr<const PluginModel> pm)
+LoadPluginWindow::new_plugin(SPtr<const PluginModel> pm)
 {
 	if (is_visible())
 		add_plugin(pm);
@@ -228,7 +228,7 @@ LoadPluginWindow::new_plugin(SharedPtr<const PluginModel> pm)
 }
 
 static std::string
-get_project_name(SharedPtr<const PluginModel> plugin)
+get_project_name(SPtr<const PluginModel> plugin)
 {
 	std::string name;
 	if (plugin->lilv_plugin()) {
@@ -254,7 +254,7 @@ get_project_name(SharedPtr<const PluginModel> plugin)
 }
 
 static std::string
-get_author_name(SharedPtr<const PluginModel> plugin)
+get_author_name(SPtr<const PluginModel> plugin)
 {
 	std::string name;
 	if (plugin->lilv_plugin()) {
@@ -269,7 +269,7 @@ get_author_name(SharedPtr<const PluginModel> plugin)
 
 void
 LoadPluginWindow::set_row(Gtk::TreeModel::Row&         row,
-                          SharedPtr<const PluginModel> plugin)
+                          SPtr<const PluginModel> plugin)
 {
 	const URIs&       uris = _app->uris();
 	const Raul::Atom& name = plugin->get_property(uris.doap_name);
@@ -303,7 +303,7 @@ LoadPluginWindow::set_row(Gtk::TreeModel::Row&         row,
 }
 
 void
-LoadPluginWindow::add_plugin(SharedPtr<const PluginModel> plugin)
+LoadPluginWindow::add_plugin(SPtr<const PluginModel> plugin)
 {
 	if (plugin->lilv_plugin() && lilv_plugin_is_replaced(plugin->lilv_plugin())) {
 		return;
@@ -342,7 +342,7 @@ LoadPluginWindow::plugin_selection_changed()
 			*_selection->get_selected_rows().begin());
 		if (iter) {
 			Gtk::TreeModel::Row row = *iter;
-			boost::shared_ptr<const PluginModel> p = row.get_value(
+			SPtr<const PluginModel> p = row.get_value(
 				_plugins_columns._col_plugin);
 			_name_offset = _app->store()->child_name_offset(
 				_graph->path(), p->default_block_symbol());
@@ -366,8 +366,8 @@ LoadPluginWindow::plugin_selection_changed()
  * sends the notification back.
  */
 string
-LoadPluginWindow::generate_module_name(SharedPtr<const PluginModel> plugin,
-                                       int                          offset)
+LoadPluginWindow::generate_module_name(SPtr<const PluginModel> plugin,
+                                       int                     offset)
 {
 	std::stringstream ss;
 	ss << plugin->default_block_symbol();
@@ -379,11 +379,11 @@ LoadPluginWindow::generate_module_name(SharedPtr<const PluginModel> plugin,
 void
 LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
 {
-	const URIs&                  uris       = _app->uris();
-	Gtk::TreeModel::Row          row        = *iter;
-	SharedPtr<const PluginModel> plugin     = row.get_value(_plugins_columns._col_plugin);
-	bool                         polyphonic = _polyphonic_checkbutton->get_active();
-	string                       name       = _name_entry->get_text();
+	const URIs&             uris       = _app->uris();
+	Gtk::TreeModel::Row     row        = *iter;
+	SPtr<const PluginModel> plugin     = row.get_value(_plugins_columns._col_plugin);
+	bool                    polyphonic = _polyphonic_checkbutton->get_active();
+	string                  name       = _name_entry->get_text();
 
 	if (name.empty())
 		name = generate_module_name(plugin, _name_offset);
@@ -446,7 +446,7 @@ LoadPluginWindow::filter_changed()
 	const URIs&              uris        = _app->uris();
 
 	for (const auto& p : *_app->store()->plugins().get()) {
-		const SharedPtr<PluginModel> plugin = p.second;
+		const SPtr<PluginModel> plugin = p.second;
 		const Raul::Atom& name = plugin->get_property(uris.doap_name);
 
 		switch (criteria) {