Move static path stuff to its own header

7 files changed, 15 insertions, 15 deletions

diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 1968a264..1aea8b26 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -505,7 +505,7 @@ ConnectWindow::gtk_callback()
 			}
 		}
 	} else if (_connect_stage == 3) {
-		_app->interface()->get(Raul::URI(Node::main_uri() + "/"));
+		_app->interface()->get(Raul::URI(main_uri() + "/"));
 		next_stage();
 	} else if (_connect_stage == 4) {
 		if (_app->store()->size() > 0) {
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 565f607e..5b1111d7 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -673,12 +673,12 @@ GraphCanvas::paste()
 	// Make a client store to serve as clipboard
 	ClientStore clipboard(_app.world()->uris(), _app.log());
 	clipboard.set_plugins(_app.store()->plugins());
-	clipboard.put(Node::main_uri(),
+	clipboard.put(main_uri(),
 	              {{uris.rdf_type, Resource::Property(uris.ingen_Graph)}});
 
 	// Parse clipboard text into clipboard store
 	boost::optional<Raul::URI> base_uri = parser->parse_string(
-		_app.world(), &clipboard, str, Node::main_uri());
+		_app.world(), &clipboard, str, main_uri());
 
 	// Figure out the copy graph base path
 	Raul::Path copy_root("/");
@@ -687,7 +687,7 @@ GraphCanvas::paste()
 		if (base[base.size() - 1] == '/') {
 			base = base.substr(0, base.size() - 1);
 		}
-		copy_root = Node::uri_to_path(Raul::URI(base));
+		copy_root = uri_to_path(Raul::URI(base));
 	}
 
 	// Find the minimum x and y coordinate of objects to be pasted
@@ -724,7 +724,7 @@ GraphCanvas::paste()
 
 		const SPtr<Node>  node     = c.second;
 		const Raul::Path& old_path = copy_root.child(node->path());
-		const Raul::URI&  old_uri  = Node::path_to_uri(old_path);
+		const Raul::URI&  old_uri  = path_to_uri(old_path);
 		const Raul::Path& new_path = avoider.map_path(parent.child(node->path()));
 
 		Node::Properties props{{uris.lv2_prototype,
@@ -748,7 +748,7 @@ GraphCanvas::paste()
 			                                            yi->second.context())});
 		}
 
-		_app.interface()->put(Node::path_to_uri(new_path), props);
+		_app.interface()->put(path_to_uri(new_path), props);
 		_pastees.insert(new_path);
 	}
 
@@ -809,7 +809,7 @@ GraphCanvas::menu_add_port(const string& sym_base, const string& name_base,
 	                       _app.forge().make(int32_t(_graph->num_ports()))));
 	props.insert(make_pair(uris.lv2_name,
 	                       _app.forge().alloc(name.c_str())));
-	_app.interface()->put(Node::path_to_uri(path), props);
+	_app.interface()->put(path_to_uri(path), props);
 }
 
 void
@@ -836,7 +836,7 @@ GraphCanvas::load_plugin(WPtr<PluginModel> weak_plugin)
 	                       Resource::Property(uris.ingen_Block)));
 	props.insert(make_pair(uris.lv2_prototype,
 	                       uris.forge.make_urid(plugin->uri())));
-	_app.interface()->put(Node::path_to_uri(path), props);
+	_app.interface()->put(path_to_uri(path), props);
 }
 
 /** Try to guess a suitable location for a new module.
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 5d66e7d6..61245b4d 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -399,7 +399,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
 		                       _app->forge().make_urid(plugin->uri())));
 		props.insert(make_pair(uris.ingen_polyphonic,
 		                       _app->forge().make(polyphonic)));
-		_app->interface()->put(Node::path_to_uri(path), props);
+		_app->interface()->put(path_to_uri(path), props);
 
 		if (_selection->get_selected_rows().size() == 1) {
 			_name_offset = (_name_offset == 0) ? 2 : _name_offset + 1;
diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp
index c717a55b..08382897 100644
--- a/src/gui/NewSubgraphWindow.cpp
+++ b/src/gui/NewSubgraphWindow.cpp
@@ -100,14 +100,14 @@ NewSubgraphWindow::ok_clicked()
 	props.insert(make_pair(_app->uris().ingen_polyphony, _app->forge().make(int32_t(poly))));
 	props.insert(make_pair(_app->uris().ingen_enabled,   _app->forge().make(bool(true))));
 	_app->interface()->put(
-		Node::path_to_uri(path), props, Resource::Graph::INTERNAL);
+		path_to_uri(path), props, Resource::Graph::INTERNAL);
 
 	// Set external (block perspective) properties
 	props = _initial_data;
 	props.insert(make_pair(_app->uris().rdf_type,
 	                       Resource::Property(_app->uris().ingen_Graph)));
 	_app->interface()->put(
-		Node::path_to_uri(path), _initial_data, Resource::Graph::EXTERNAL);
+		path_to_uri(path), _initial_data, Resource::Graph::EXTERNAL);
 
 	hide();
 }
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 7079d9c4..60ce612d 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -159,7 +159,7 @@ PortMenu::on_menu_expose()
 	r.set_property(uris.ingen_canvasX, _app->forge().make(block_x + x_off));
 	r.set_property(uris.ingen_canvasY, _app->forge().make(block_y + y_off));
 
-	_app->interface()->put(Node::path_to_uri(path), r.properties());
+	_app->interface()->put(path_to_uri(path), r.properties());
 
 	if (port->is_input()) {
 		_app->interface()->connect(path, _object->path());
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 5020f6ef..91c524b2 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -118,7 +118,7 @@ RenameWindow::ok_clicked()
 
 	if (!label.empty() && (name_atom.type() != uris.forge.String ||
 	                       label != name_atom.ptr<char>())) {
-		_app->set_property(Node::path_to_uri(path),
+		_app->set_property(path_to_uri(path),
 		                   uris.lv2_name,
 		                   _app->forge().alloc(label));
 	}
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 9387f742..a4aa47fb 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -147,7 +147,7 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	props.insert(std::make_pair(ui->app->uris().rdf_type,
 	                            Ingen::Resource::Property(
 		                            ui->app->uris().ingen_Graph)));
-	ui->app->store()->put(Ingen::Node::main_uri(), props);
+	ui->app->store()->put(Ingen::main_uri(), props);
 
 	// Create a GraphBox for the root and set as the UI widget
 	SPtr<const Ingen::Client::GraphModel> root =
@@ -158,7 +158,7 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	*widget = ui->view->gobj();
 
 	// Request the actual root graph
-	ui->world->interface()->get(Ingen::Node::main_uri());
+	ui->world->interface()->get(Ingen::main_uri());
 
 	return ui;
 }