Use ingen:root as the path for the root patch, opening up path space for engine/driver/etc.

Strict conversion between Path and URI (Path no longer is-a URI).


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

21 files changed, 59 insertions, 59 deletions

diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index c6c776d5..8dbb9e21 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -122,7 +122,7 @@ BreadCrumbs::build(Path path, SharedPtr<PatchView> view)
 		root_but->set_active(root_but->path() == _active_path);
 
 		Path working_path = "/";
-		string suffix = path.chop_scheme().substr(1);
+		string suffix = path.substr(1);
 		while (suffix.length() > 0) {
 			if (suffix[0] == '/')
 				suffix = suffix.substr(1);
@@ -181,7 +181,7 @@ void
 BreadCrumbs::object_destroyed(const URI& uri)
 {
 	for (std::list<BreadCrumb*>::iterator i = _breadcrumbs.begin(); i != _breadcrumbs.end(); ++i) {
-		if ((*i)->path() == uri) {
+		if ((*i)->path() == uri.c_str()) {
 			// Remove all crumbs after the removed one (inclusive)
 			for (std::list<BreadCrumb*>::iterator j = i; j != _breadcrumbs.end(); ) {
 				BreadCrumb* bc = *j;
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 81426620..3b683cf9 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -412,7 +412,7 @@ ConnectWindow::gtk_callback()
 			}
 		}
 	} else if (_connect_stage == 2) {
-		_app->interface()->get(Path("/"));
+		_app->interface()->get(GraphObject::root_uri());
 		if (_widgets_loaded)
 			_progress_label->set_text(string("Requesting root patch..."));
 		++_connect_stage;
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 5042423d..691da285 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -352,7 +352,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
 		                       _app->forge().alloc_uri(plugin->uri().str())));
 		props.insert(make_pair(uris.ingen_polyphonic,
 		                       _app->forge().make(polyphonic)));
-		_app->interface()->put(path, props);
+		_app->interface()->put(GraphObject::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/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 7f3eab46..3c1546d5 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -102,12 +102,12 @@ NewSubpatchWindow::ok_clicked()
 	props.insert(make_pair(_app->uris().rdf_type,        _app->uris().ingen_Patch));
 	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(path, props, Resource::INTERNAL);
+	_app->interface()->put(GraphObject::path_to_uri(path), props, Resource::INTERNAL);
 
 	// Set external (node perspective) properties
 	props = _initial_data;
 	props.insert(make_pair(_app->uris().rdf_type, _app->uris().ingen_Patch));
-	_app->interface()->put(path, _initial_data, Resource::EXTERNAL);
+	_app->interface()->put(GraphObject::path_to_uri(path), _initial_data, Resource::EXTERNAL);
 
 	hide();
 }
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index cb15342d..5c573d9b 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -156,7 +156,7 @@ NodeMenu::on_menu_randomize()
 			nm->port_value_range(*i, min, max, _app->sample_rate());
 			const float val = g_random_double_range(0.0, 1.0) * (max - min) + min;
 			_app->interface()->set_property(
-				(*i)->path(),
+				(*i)->uri(),
 				_app->uris().ingen_value,
 				_app->forge().make(val));
 		}
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 8e9f88e0..af63164f 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -211,9 +211,9 @@ void
 NodeModule::on_embed_gui_toggled(bool embed)
 {
 	embed_gui(embed);
-	app().interface()->set_property(_node->path(),
-	                             app().uris().ingen_uiEmbedded,
-	                             app().forge().make(embed));
+	app().interface()->set_property(_node->uri(),
+	                                app().uris().ingen_uiEmbedded,
+	                                app().forge().make(embed));
 }
 
 void
@@ -321,7 +321,7 @@ NodeModule::popup_gui()
 			if (!_plugin_ui->is_resizable()) {
 				_gui_window->set_resizable(false);
 			}
-			_gui_window->set_title(_node->path().chop_scheme() + " UI - Ingen");
+			_gui_window->set_title(_node->path().str() + " UI - Ingen");
 			_gui_window->set_role("plugin_ui");
 			_gui_window->add(*_gui_widget);
 			_gui_widget->show_all();
@@ -333,7 +333,7 @@ NodeModule::popup_gui()
 
 			return true;
 		} else {
-			warn << "No LV2 GUI for " << _node->path().chop_scheme() << endl;
+			warn << "No LV2 GUI for " << _node->path() << endl;
 		}
 	}
 
@@ -397,7 +397,7 @@ NodeModule::store_location(double ax, double ay)
 		Resource::Properties add;
 		add.insert(make_pair(uris.ingen_canvasX, x));
 		add.insert(make_pair(uris.ingen_canvasY, y));
-		app().interface()->delta(_node->path(), remove, add);
+		app().interface()->delta(_node->uri(), remove, add);
 	}
 }
 
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 4fa99677..0cfb2482 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -93,7 +93,7 @@ ObjectMenu::init(App& app, SharedPtr<const ObjectModel> object)
 void
 ObjectMenu::on_menu_learn()
 {
-	_app->interface()->set_property(_object->path(),
+	_app->interface()->set_property(_object->uri(),
 			_app->uris().ingen_controlBinding,
 			_app->uris().wildcard);
 }
@@ -105,7 +105,7 @@ ObjectMenu::on_menu_unlearn()
 	remove.insert(std::make_pair(
 			_app->uris().ingen_controlBinding,
 			_app->uris().wildcard));
-	_app->interface()->delta(_object->path(), remove, Resource::Properties());
+	_app->interface()->delta(_object->uri(), remove, Resource::Properties());
 }
 
 void
@@ -113,7 +113,7 @@ ObjectMenu::on_menu_polyphonic()
 {
 	if (_enable_signal)
 		_app->interface()->set_property(
-			_object->path(),
+			_object->uri(),
 			_app->uris().ingen_polyphonic,
 			_app->forge().make(bool(_polyphonic_menuitem->get_active())));
 }
@@ -131,7 +131,7 @@ ObjectMenu::property_changed(const URI& predicate, const Atom& value)
 void
 ObjectMenu::on_menu_destroy()
 {
-	_app->interface()->del(_object->path());
+	_app->interface()->del(_object->uri());
 }
 
 void
diff --git a/src/gui/PatchBox.cpp b/src/gui/PatchBox.cpp
index 7c9483f2..30330fd5 100644
--- a/src/gui/PatchBox.cpp
+++ b/src/gui/PatchBox.cpp
@@ -342,7 +342,7 @@ void
 PatchBox::show_status(const ObjectModel* model)
 {
 	std::stringstream msg;
-	msg << model->path().chop_scheme();
+	msg << model->path();
 
 	const PortModel* port = 0;
 	const NodeModel* node = 0;
@@ -362,7 +362,7 @@ void
 PatchBox::show_port_status(const PortModel* port, const Raul::Atom& value)
 {
 	std::stringstream msg;
-	msg << port->path().chop_scheme();
+	msg << port->path();
 
 	const NodeModel* parent = dynamic_cast<const NodeModel*>(port->parent().get());
 	if (parent) {
@@ -430,7 +430,7 @@ PatchBox::event_save()
 	} else {
 		_app->loader()->save_patch(_patch, document.get_uri());
 		_status_bar->push(
-			(boost::format("Saved %1% to %2%") % _patch->path().chop_scheme()
+			(boost::format("Saved %1% to %2%") % _patch->path().c_str()
 			 % document.get_uri()).str(),
 			STATUS_CONTEXT_PATCH);
 	}
@@ -543,7 +543,7 @@ PatchBox::event_save_as()
 				_app->forge().alloc_uri(uri.c_str()),
 				Resource::EXTERNAL);
 			_status_bar->push(
-				(boost::format("Saved %1% to %2%") % _patch->path().chop_scheme()
+				(boost::format("Saved %1% to %2%") % _patch->path().c_str()
 				 % filename).str(),
 				STATUS_CONTEXT_PATCH);
 		}
@@ -583,7 +583,8 @@ PatchBox::event_draw()
 		if (confirm) {
 			_view->canvas()->export_dot(filename.c_str());
 			_status_bar->push(
-				(boost::format("Rendered %1% to %2%") % _patch->path() % filename).str(),
+				(boost::format("Rendered %1% to %2%")
+				 % _patch->path().str() % filename).str(),
 				STATUS_CONTEXT_PATCH);
 		}
 	}
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 6e6667fc..eaab0b0c 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -616,11 +616,11 @@ destroy_node(GanvNode* node, void* data)
 	NodeModule*   node_module = dynamic_cast<NodeModule*>(module);
 
 	if (node_module) {
-		app->interface()->del(node_module->node()->path());
+		app->interface()->del(node_module->node()->uri());
 	} else {
 		PatchPortModule* port_module = dynamic_cast<PatchPortModule*>(module);
 		if (port_module) {
-			app->interface()->del(port_module->port()->path());
+			app->interface()->del(port_module->port()->uri());
 		}
 	}
 }
@@ -716,14 +716,14 @@ PatchCanvas::paste()
 	clipboard.set_plugins(_app.store()->plugins());
 
 	// mkdir -p
-	string to_create = _patch->path().chop_scheme().substr(1);
+	string to_create = _patch->path().substr(1);
 	string created = "/";
 	Resource::Properties props;
 	props.insert(make_pair(uris.rdf_type,
 	                       uris.ingen_Patch));
 	props.insert(make_pair(uris.ingen_polyphony,
 	                       _app.forge().make(int32_t(_patch->internal_poly()))));
-	clipboard.put(Path("/"), props);
+	clipboard.put(GraphObject::root_uri(), props);
 	size_t first_slash;
 	while (to_create != "/" && !to_create.empty()
 	       && (first_slash = to_create.find("/")) != string::npos) {
@@ -734,7 +734,7 @@ PatchCanvas::paste()
 	}
 
 	if (!_patch->path().is_root())
-		clipboard.put(_patch->path(), props);
+		clipboard.put(_patch->uri(), props);
 
 	boost::optional<Raul::Path>   parent;
 	boost::optional<Raul::Symbol> symbol;
@@ -817,7 +817,7 @@ PatchCanvas::menu_add_port(const string& sym_base, const string& name_base,
 	                       _app.forge().make(int32_t(_patch->num_ports()))));
 	props.insert(make_pair(uris.lv2_name,
 	                       _app.forge().alloc(name.c_str())));
-	_app.interface()->put(path, props);
+	_app.interface()->put(GraphObject::path_to_uri(path), props);
 }
 
 void
@@ -843,7 +843,7 @@ PatchCanvas::load_plugin(WeakPtr<PluginModel> weak_plugin)
 	props.insert(make_pair(uris.rdf_type, uris.ingen_Node));
 	props.insert(make_pair(uris.ingen_prototype,
 	                       uris.forge.alloc_uri(plugin->uri().str())));
-	_app.interface()->put(path, props);
+	_app.interface()->put(GraphObject::path_to_uri(path), props);
 }
 
 /** Try to guess a suitable location for a new module.
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 5e57adb5..3ccf8d07 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -109,7 +109,7 @@ PatchPortModule::store_location(double ax, double ay)
 		                     Resource::Property(x, Resource::INTERNAL)));
 		add.insert(make_pair(uris.ingen_canvasY,
 		                     Resource::Property(y, Resource::INTERNAL)));
-		app().interface()->delta(_model->path(), remove, add);
+		app().interface()->delta(_model->uri(), remove, add);
 	}
 }
 
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index b6c67211..bd7b62b7 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -188,7 +188,7 @@ PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str)
 
 	if (_enable_signal)
 		_app->interface()->set_property(
-			pm->path(),
+			pm->uri(),
 			_app->uris().ingen_enabled,
 			_app->forge().make((bool)!pm->enabled()));
 }
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 1e9e2d6a..0d2bf21b 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -163,7 +163,7 @@ PatchView::process_toggled()
 		return;
 
 	_app->interface()->set_property(
-		_patch->path(),
+		_patch->uri(),
 		_app->uris().ingen_enabled,
 		_app->forge().make((bool)_process_but->get_active()));
 }
@@ -174,7 +174,7 @@ PatchView::poly_changed()
 	const int poly = _poly_spin->get_value_as_int();
 	if (_enable_signal && poly != (int)_patch->internal_poly()) {
 		_app->interface()->set_property(
-			_patch->path(),
+			_patch->uri(),
 			_app->uris().ingen_polyphony,
 			_app->forge().make(poly));
 	}
@@ -183,7 +183,7 @@ PatchView::poly_changed()
 void
 PatchView::refresh_clicked()
 {
-	_app->interface()->get(_patch->path());
+	_app->interface()->get(_patch->uri());
 }
 
 void
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index 0ee60760..9b3d1a97 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -38,7 +38,6 @@ PatchWindow::PatchWindow(BaseObjectType*                   cobject,
 
 	xml->get_widget_derived("patch_win_vbox", _box);
 
-	//set_title(_patch->path().chop_scheme() + " - Ingen");
 	set_title("Ingen");
 }
 
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index f70e8576..5744a84d 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -151,7 +151,7 @@ Port::on_value_changed(GVariant* value)
 	const Raul::Atom atom = _app.forge().make(float(g_variant_get_double(value)));
 	if (atom != model()->value()) {
 		Ingen::World* const world = _app.world();
-		_app.interface()->set_property(model()->path(),
+		_app.interface()->set_property(model()->uri(),
 		                               world->uris().ingen_value,
 		                               atom);
 	}
@@ -175,7 +175,7 @@ Port::value_changed(const Atom& value)
 void
 Port::on_scale_point_activated(float f)
 {
-	_app.interface()->set_property(model()->path(),
+	_app.interface()->set_property(model()->uri(),
 	                               _app.world()->uris().ingen_value,
 	                               _app.world()->forge().make(f));
 }
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 9b1f8aa0..b2a7cc21 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -105,7 +105,7 @@ PortMenu::on_menu_set_min()
 	SharedPtr<const PortModel> model = PtrCast<const PortModel>(_object);
 	const Raul::Atom&          value = model->get_property(uris.ingen_value);
 	if (value.is_valid())
-		_app->interface()->set_property(_object->path(), uris.lv2_minimum, value);
+		_app->interface()->set_property(_object->uri(), uris.lv2_minimum, value);
 }
 
 void
@@ -115,7 +115,7 @@ PortMenu::on_menu_set_max()
 	SharedPtr<const PortModel> model = PtrCast<const PortModel>(_object);
 	const Raul::Atom&          value = model->get_property(uris.ingen_value);
 	if (value.is_valid())
-		_app->interface()->set_property(_object->path(), uris.lv2_maximum, value);
+		_app->interface()->set_property(_object->uri(), uris.lv2_maximum, value);
 }
 
 void
@@ -129,12 +129,12 @@ PortMenu::on_menu_reset_range()
 	parent->default_port_value_range(model, min, max);
 
 	if (!std::isnan(min))
-		_app->interface()->set_property(_object->path(),
+		_app->interface()->set_property(_object->uri(),
 		                                uris.lv2_minimum,
 		                                _app->forge().make(min));
 
 	if (!std::isnan(max))
-		_app->interface()->set_property(_object->path(),
+		_app->interface()->set_property(_object->uri(),
 		                                uris.lv2_maximum,
 		                                _app->forge().make(max));
 }
@@ -162,7 +162,7 @@ PortMenu::on_menu_expose()
 	r.set_property(uris.ingen_canvasX, _app->forge().make(node_x + x_off));
 	r.set_property(uris.ingen_canvasY, _app->forge().make(node_y + y_off));
 
-	_app->interface()->put(path, r.properties());
+	_app->interface()->put(GraphObject::path_to_uri(path), r.properties());
 
 	if (port->is_input()) {
 		_app->interface()->connect(path, _object->path());
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 56996011..900c93c2 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -65,7 +65,7 @@ PortPropertiesWindow::present(SharedPtr<const PortModel> pm)
 
 	_port_model = pm;
 
-	set_title(pm->path().chop_scheme() + " Properties - Ingen");
+	set_title(pm->path().str() + " Properties - Ingen");
 
 	float min = 0.0f, max = 1.0f;
 	boost::shared_ptr<NodeModel> parent = PtrCast<NodeModel>(_port_model->parent());
@@ -158,7 +158,7 @@ PortPropertiesWindow::ok()
 	props.insert(
 		make_pair(uris.lv2_maximum,
 		          _app->forge().make(float(_max_spinner->get_value()))));
-	_app->interface()->put(_port_model->path(), props);
+	_app->interface()->put(_port_model->uri(), props);
 	hide();
 }
 
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 1a4228b8..a79e2737 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -254,7 +254,7 @@ PropertiesWindow::set_object(SharedPtr<const ObjectModel> model)
 	reset();
 	_model = model;
 
-	set_title(model->path().chop_scheme() + " Properties - Ingen");
+	set_title(model->path().str() + " Properties - Ingen");
 
 	World* world = _app->world();
 
@@ -506,7 +506,7 @@ PropertiesWindow::add_clicked()
 
 	Resource::Properties properties;
 	properties.insert(make_pair(key_uri.c_str(), value));
-	_app->interface()->put(_model->path(), properties);
+	_app->interface()->put(_model->uri(), properties);
 }
 	
 void
@@ -531,7 +531,7 @@ PropertiesWindow::apply_clicked()
 		}
 	}
 
-	_app->interface()->put(_model->path(), properties);
+	_app->interface()->put(_model->uri(), properties);
 
 	LOG(debug) << "}" << endl;
 }
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index c770a087..31ebbf22 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -132,9 +132,9 @@ RenameWindow::ok_clicked()
 	}
 
 	if (!label.empty() && (!name_atom.is_valid() || label != name_atom.get_string())) {
-		_app->interface()->set_property(path,
-		                             uris.lv2_name,
-		                             _app->forge().alloc(label));
+		_app->interface()->set_property(GraphObject::path_to_uri(path),
+		                                uris.lv2_name,
+		                                _app->forge().alloc(label));
 	}
 
 	hide();
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 8b9dfe5e..dd09e992 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -80,7 +80,7 @@ SubpatchModule::store_location(double ax, double ay)
 		                     Resource::Property(x, Resource::EXTERNAL)));
 		add.insert(make_pair(uris.ingen_canvasY,
 		                     Resource::Property(y, Resource::EXTERNAL)));
-		app().interface()->delta(_node->path(), remove, add);
+		app().interface()->delta(_node->uri(), remove, add);
 	}
 }
 
@@ -104,7 +104,7 @@ SubpatchModule::browse_to_patch()
 void
 SubpatchModule::menu_remove()
 {
-	app().interface()->del(_patch->path());
+	app().interface()->del(_patch->uri());
 }
 
 } // namespace GUI
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 6042a190..0834f666 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -204,7 +204,7 @@ WindowFactory::present_load_plugin(SharedPtr<const PatchModel> patch,
 		_load_plugin_win->set_default_size(width - width / 8, height / 2);
 	}
 	_load_plugin_win->set_title(
-		string("Load Plugin - ") + patch->path().chop_scheme() + " - Ingen");
+		string("Load Plugin - ") + patch->path().str() + " - Ingen");
 	_load_plugin_win->present(patch, data);
 }
 
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 0e512801..069b8031 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -14,13 +14,13 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/client/ClientStore.hpp"
-#include "ingen/client/PatchModel.hpp"
-#include "ingen/client/SigClientInterface.hpp"
 #include "ingen/AtomReader.hpp"
 #include "ingen/AtomSink.hpp"
 #include "ingen/AtomWriter.hpp"
 #include "ingen/World.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/SigClientInterface.hpp"
 #include "ingen/runtime_paths.hpp"
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
 
@@ -135,17 +135,17 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	Ingen::Resource::Properties props;
 	props.insert(std::make_pair(ui->app->uris().rdf_type,
 	                            ui->app->uris().ingen_Patch));
-	ui->app->store()->put("path:/", props);
+	ui->app->store()->put(Ingen::GraphObject::root_uri(), props);
 
 	// Create a PatchBox for the root and set as the UI widget
 	SharedPtr<const Ingen::Client::PatchModel> root = PtrCast<const Ingen::Client::PatchModel>(
-		ui->app->store()->object("path:/"));
+		ui->app->store()->object("/"));
 	ui->view = Ingen::GUI::PatchBox::create(*ui->app, root);
 	ui->view->unparent();
 	*widget = ui->view->gobj();
 
 	// Request the actual root patch
-	ui->world->interface()->get("path:/");
+	ui->world->interface()->get(Ingen::GraphObject::root_uri());
 
 	return ui;
 }