Move Properties out of Resource

23 files changed, 86 insertions, 89 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 07e6f262..b1c92ade 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -280,9 +280,9 @@ App::set_tooltip(Gtk::Widget* widget, const LilvNode* node)
 }
 
 void
-App::put(const Raul::URI&            uri,
-         const Resource::Properties& properties,
-         Resource::Graph             ctx)
+App::put(const Raul::URI&  uri,
+         const Properties& properties,
+         Resource::Graph   ctx)
 {
 	_enable_signal = false;
 	for (const auto& p : properties) {
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 61336747..3dc09ff9 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -143,9 +143,9 @@ protected:
 	bool animate();
 	void response(int32_t id, Ingen::Status status, const std::string& subject);
 
-	void put(const Raul::URI&            uri,
-	         const Resource::Properties& properties,
-	         Resource::Graph             ctx);
+	void put(const Raul::URI&  uri,
+	         const Properties& properties,
+	         Resource::Graph   ctx);
 
 	void property_change(const Raul::URI& subject,
 	                     const Raul::URI& key,
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 6423c016..4aa3589f 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -868,7 +868,7 @@ GraphBox::event_sprung_layout_toggled()
 
 	_view->canvas()->set_sprung_layout(sprung);
 
-	Resource::Properties properties;
+	Properties properties;
 	properties.insert(make_pair(_app->uris().ingen_sprungLayout,
 	                            _app->forge().make(sprung)));
 	_app->interface()->put(_graph->uri(), properties);
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 5b1111d7..6d22f407 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -652,7 +652,7 @@ GraphCanvas::copy_selection()
 void
 GraphCanvas::paste()
 {
-	typedef Node::Properties::const_iterator PropIter;
+	typedef Properties::const_iterator PropIter;
 
 	std::lock_guard<std::mutex> lock(_app.world()->rdf_mutex());
 
@@ -674,7 +674,7 @@ GraphCanvas::paste()
 	ClientStore clipboard(_app.world()->uris(), _app.log());
 	clipboard.set_plugins(_app.store()->plugins());
 	clipboard.put(main_uri(),
-	              {{uris.rdf_type, Resource::Property(uris.ingen_Graph)}});
+	              {{uris.rdf_type, Property(uris.ingen_Graph)}});
 
 	// Parse clipboard text into clipboard store
 	boost::optional<Raul::URI> base_uri = parser->parse_string(
@@ -727,8 +727,8 @@ GraphCanvas::paste()
 		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,
-		                        _app.forge().make_urid(old_uri)}};
+		Properties props{{uris.lv2_prototype,
+		                  _app.forge().make_urid(old_uri)}};
 
 		// Set the same types
 		const auto t = node->properties().equal_range(uris.rdf_type);
@@ -739,13 +739,13 @@ GraphCanvas::paste()
 		PropIter yi = node->properties().find(uris.ingen_canvasY);
 		if (xi != node->properties().end()) {
 			const float x = xi->second.get<float>() - min_x + paste_x;
-			props.insert({xi->first, Resource::Property(_app.forge().make(x),
-			                                            xi->second.context())});
+			props.insert({xi->first, Property(_app.forge().make(x),
+			                                  xi->second.context())});
 		}
 		if (yi != node->properties().end()) {
 			const float y = yi->second.get<float>() - min_y + paste_y;
-			props.insert({yi->first, Resource::Property(_app.forge().make(y),
-			                                            yi->second.context())});
+			props.insert({yi->first, Property(_app.forge().make(y),
+			                                  yi->second.context())});
 		}
 
 		_app.interface()->put(path_to_uri(new_path), props);
@@ -795,16 +795,16 @@ GraphCanvas::menu_add_port(const string& sym_base, const string& name_base,
 
 	const URIs& uris = _app.uris();
 
-	Resource::Properties props = get_initial_data(Resource::Graph::INTERNAL);
+	Properties props = get_initial_data(Resource::Graph::INTERNAL);
 	props.insert(make_pair(uris.rdf_type, _app.forge().make_urid(type)));
 	if (type == uris.atom_AtomPort) {
 		props.insert(make_pair(uris.atom_bufferType,
-		                       Resource::Property(uris.atom_Sequence)));
+		                       Property(uris.atom_Sequence)));
 	}
 	props.insert(make_pair(uris.rdf_type,
-	                       Resource::Property(is_output
-	                                          ? uris.lv2_OutputPort
-	                                          : uris.lv2_InputPort)));
+	                       Property(is_output
+	                                ? uris.lv2_OutputPort
+	                                : uris.lv2_InputPort)));
 	props.insert(make_pair(uris.lv2_index,
 	                       _app.forge().make(int32_t(_graph->num_ports()))));
 	props.insert(make_pair(uris.lv2_name,
@@ -831,9 +831,9 @@ GraphCanvas::load_plugin(WPtr<PluginModel> weak_plugin)
 	const Raul::Path path = _graph->path().child(symbol);
 
 	// FIXME: polyphony?
-	Node::Properties props = get_initial_data();
+	Properties props = get_initial_data();
 	props.insert(make_pair(uris.rdf_type,
-	                       Resource::Property(uris.ingen_Block)));
+	                       Property(uris.ingen_Block)));
 	props.insert(make_pair(uris.lv2_prototype,
 	                       uris.forge.make_urid(plugin->uri())));
 	_app.interface()->put(path_to_uri(path), props);
@@ -851,19 +851,19 @@ GraphCanvas::get_new_module_location(double& x, double& y)
 	y = scroll_y + 20;
 }
 
-Node::Properties
+Properties
 GraphCanvas::get_initial_data(Resource::Graph ctx)
 {
-	Node::Properties result;
+	Properties result;
 	const URIs& uris = _app.uris();
 	result.insert(
 		make_pair(uris.ingen_canvasX,
-		          Resource::Property(_app.forge().make((float)_menu_x),
-		                             ctx)));
+		          Property(_app.forge().make((float)_menu_x),
+		                   ctx)));
 	result.insert(
 		make_pair(uris.ingen_canvasY,
-		          Resource::Property(_app.forge().make((float)_menu_y),
-		                             ctx)));
+		          Property(_app.forge().make((float)_menu_y),
+		                   ctx)));
 	return result;
 }
 
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 61c695c6..c2212426 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -105,7 +105,7 @@ private:
 
 	typedef std::multimap<const std::string, const LilvPluginClass*> LV2Children;
 
-	Node::Properties get_initial_data(Resource::Graph ctx=Resource::Graph::DEFAULT);
+	Properties get_initial_data(Resource::Graph ctx=Resource::Graph::DEFAULT);
 
 	Ganv::Port* get_port_view(SPtr<Client::PortModel> port);
 
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index dd402f9b..7a0ce102 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -107,8 +107,8 @@ GraphPortModule::store_location(double ax, double ay)
 	{
 		app().interface()->put(
 			_model->uri(),
-			{{uris.ingen_canvasX, Resource::Property(x, Resource::Graph::INTERNAL)},
-			 {uris.ingen_canvasY, Resource::Property(y, Resource::Graph::INTERNAL)}});
+			{{uris.ingen_canvasX, Property(x, Property::Graph::INTERNAL)},
+			 {uris.ingen_canvasY, Property(y, Property::Graph::INTERNAL)}});
 	}
 }
 
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index 7c0de2f1..5f8f8e11 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -99,7 +99,7 @@ LoadGraphWindow::LoadGraphWindow(BaseObjectType*                   cobject,
 void
 LoadGraphWindow::present(SPtr<const GraphModel> graph,
                          bool                   import,
-                         Node::Properties       data)
+                         Properties             data)
 {
 	_import = import;
 	set_graph(graph);
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index afd2d172..8ec5ed4b 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -52,7 +52,7 @@ public:
 
 	void present(SPtr<const Client::GraphModel> graph,
 	             bool                           import,
-	             Node::Properties               data);
+	             Properties                     data);
 
 protected:
 	void on_show();
@@ -70,7 +70,7 @@ private:
 
 	App* _app;
 
-	Node::Properties _initial_data;
+	Properties _initial_data;
 
 	SPtr<const Client::GraphModel> _graph;
 
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 61245b4d..3d6927cb 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -130,7 +130,7 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType*                   cobject,
 
 void
 LoadPluginWindow::present(SPtr<const GraphModel> graph,
-                          Node::Properties       data)
+                          Properties             data)
 {
 	set_graph(graph);
 	_initial_data = data;
@@ -391,10 +391,10 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
 
 		dialog.run();
 	} else {
-		Raul::Path path = _graph->path().child(Raul::Symbol::symbolify(name));
-		Resource::Properties props = _initial_data;
+		Raul::Path path  = _graph->path().child(Raul::Symbol::symbolify(name));
+		Properties props = _initial_data;
 		props.insert(make_pair(uris.rdf_type,
-		                       Resource::Property(uris.ingen_Block)));
+		                       Property(uris.ingen_Block)));
 		props.insert(make_pair(uris.lv2_prototype,
 		                       _app->forge().make_urid(plugin->uri())));
 		props.insert(make_pair(uris.ingen_polyphonic,
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 5c11656c..e38760a6 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -60,7 +60,7 @@ public:
 	void add_plugin(SPtr<const Client::PluginModel> plugin);
 
 	void present(SPtr<const Client::GraphModel> graph,
-	             Node::Properties               data);
+	             Properties                     data);
 
 protected:
 	void on_show();
@@ -128,7 +128,7 @@ private:
 
 	void load_plugin(const Gtk::TreeModel::iterator& iter);
 
-	Node::Properties _initial_data;
+	Properties _initial_data;
 
 	SPtr<const Client::GraphModel> _graph;
 
diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp
index 08382897..b8459bc6 100644
--- a/src/gui/NewSubgraphWindow.cpp
+++ b/src/gui/NewSubgraphWindow.cpp
@@ -50,7 +50,7 @@ NewSubgraphWindow::NewSubgraphWindow(BaseObjectType*                   cobject,
 
 void
 NewSubgraphWindow::present(SPtr<const Client::GraphModel> graph,
-                           Node::Properties               data)
+                           Properties                     data)
 {
 	set_graph(graph);
 	_initial_data = data;
@@ -95,8 +95,8 @@ NewSubgraphWindow::ok_clicked()
 		Raul::Symbol::symbolify(_name_entry->get_text()));
 
 	// Create graph
-	Resource::Properties props;
-	props.insert(make_pair(_app->uris().rdf_type,        Resource::Property(_app->uris().ingen_Graph)));
+	Properties props;
+	props.insert(make_pair(_app->uris().rdf_type,        Property(_app->uris().ingen_Graph)));
 	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(
@@ -105,7 +105,7 @@ NewSubgraphWindow::ok_clicked()
 	// Set external (block perspective) properties
 	props = _initial_data;
 	props.insert(make_pair(_app->uris().rdf_type,
-	                       Resource::Property(_app->uris().ingen_Graph)));
+	                       Property(_app->uris().ingen_Graph)));
 	_app->interface()->put(
 		path_to_uri(path), _initial_data, Resource::Graph::EXTERNAL);
 
diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp
index 9bf29302..395856ba 100644
--- a/src/gui/NewSubgraphWindow.hpp
+++ b/src/gui/NewSubgraphWindow.hpp
@@ -49,14 +49,14 @@ public:
 	void set_graph(SPtr<const Client::GraphModel> graph);
 
 	void present(SPtr<const Client::GraphModel> graph,
-	             Node::Properties               data);
+	             Properties                     data);
 
 private:
 	void name_changed();
 	void ok_clicked();
 	void cancel_clicked();
 
-	Node::Properties               _initial_data;
+	Properties                     _initial_data;
 	SPtr<const Client::GraphModel> _graph;
 
 	Gtk::Entry*      _name_entry;
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index f08754fa..13f41502 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -218,7 +218,7 @@ NodeMenu::on_save_preset_activated()
 		const std::string real_path = Glib::build_filename(dirname, bundle, file);
 		const std::string real_uri  = Glib::filename_to_uri(real_path);
 
-		Resource::Properties props{
+		Properties props{
 			{ _app->uris().rdf_type,
 			  _app->uris().pset_Preset },
 			{ _app->uris().rdfs_label,
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 5f287d15..9b1d095b 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -100,11 +100,11 @@ ObjectMenu::on_menu_learn()
 void
 ObjectMenu::on_menu_unlearn()
 {
-	Resource::Properties remove;
+	Properties remove;
 	remove.insert(std::make_pair(
 		              _app->uris().midi_binding,
-		              Resource::Property(_app->uris().patch_wildcard)));
-	_app->interface()->delta(_object->uri(), remove, Resource::Properties());
+		              Property(_app->uris().patch_wildcard)));
+	_app->interface()->delta(_object->uri(), remove, Properties());
 }
 
 void
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 60ce612d..63bd046c 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -130,10 +130,10 @@ PortMenu::on_menu_reset_range()
 	SPtr<const PortModel> model = dynamic_ptr_cast<const PortModel>(_object);
 
 	// Remove lv2:minimum and lv2:maximum properties
-	Resource::Properties remove;
-	remove.insert({uris.lv2_minimum, Resource::Property(uris.patch_wildcard)});
-	remove.insert({uris.lv2_maximum, Resource::Property(uris.patch_wildcard)});
-	_app->interface()->delta(_object->uri(), remove, Resource::Properties());
+	Properties remove;
+	remove.insert({uris.lv2_minimum, Property(uris.patch_wildcard)});
+	remove.insert({uris.lv2_maximum, Property(uris.patch_wildcard)});
+	_app->interface()->delta(_object->uri(), remove, Properties());
 }
 
 void
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 2b77f93e..dfae695a 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -543,9 +543,9 @@ PropertiesWindow::add_clicked()
 	const Atom& value = get_value(_value_type, _value_bin->get_child());
 	if (value.is_valid()) {
 		// Send property to engine
-		Resource::Properties properties;
+		Properties properties;
 		properties.insert(make_pair(Raul::URI(key_uri.c_str()),
-		                            Resource::Property(value)));
+		                            Property(value)));
 		_app->interface()->put(_model->uri(), properties);
 	}
 }
@@ -560,8 +560,8 @@ PropertiesWindow::cancel_clicked()
 void
 PropertiesWindow::apply_clicked()
 {
-	Resource::Properties remove;
-	Resource::Properties add;
+	Properties remove;
+	Properties add;
 	for (const auto& r : _records) {
 		const Raul::URI& uri    = r.first;
 		const Record&    record = r.second;
diff --git a/src/gui/RDFS.cpp b/src/gui/RDFS.cpp
index baa51943..b182b989 100644
--- a/src/gui/RDFS.cpp
+++ b/src/gui/RDFS.cpp
@@ -114,8 +114,8 @@ datatypes(World* world, URISet& types, bool super)
 URISet
 types(World* world, SPtr<const Client::ObjectModel> model)
 {
-	typedef Resource::Properties::const_iterator PropIter;
-	typedef std::pair<PropIter, PropIter>        PropRange;
+	typedef Properties::const_iterator    PropIter;
+	typedef std::pair<PropIter, PropIter> PropRange;
 
 	// Start with every rdf:type
 	URISet types;
diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp
index 1dc4fe49..5c05153f 100644
--- a/src/gui/SubgraphModule.cpp
+++ b/src/gui/SubgraphModule.cpp
@@ -72,8 +72,8 @@ SubgraphModule::store_location(double ax, double ay)
 	{
 		app().interface()->put(
 			_graph->uri(),
-			{{uris.ingen_canvasX, Resource::Property(x, Resource::Graph::EXTERNAL)},
-			 {uris.ingen_canvasY, Resource::Property(y, Resource::Graph::EXTERNAL)}});
+			{{uris.ingen_canvasX, Property(x, Resource::Graph::EXTERNAL)},
+			 {uris.ingen_canvasY, Property(y, Resource::Graph::EXTERNAL)}});
 	}
 }
 
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 98314b66..7f8131ec 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -69,11 +69,11 @@ ThreadedLoader::run()
 }
 
 void
-ThreadedLoader::load_graph(bool                       merge,
-                           const Glib::ustring&       document_uri,
-                           optional<Raul::Path>       engine_parent,
-                           optional<Raul::Symbol>     engine_symbol,
-                           optional<Node::Properties> engine_data)
+ThreadedLoader::load_graph(bool                   merge,
+                           const Glib::ustring&   document_uri,
+                           optional<Raul::Path>   engine_parent,
+                           optional<Raul::Symbol> engine_symbol,
+                           optional<Properties>   engine_data)
 {
 	_mutex.lock();
 
@@ -98,10 +98,10 @@ ThreadedLoader::load_graph(bool                       merge,
 }
 
 void
-ThreadedLoader::load_graph_event(const Glib::ustring&       document_uri,
-                                 optional<Raul::Path>       engine_parent,
-                                 optional<Raul::Symbol>     engine_symbol,
-                                 optional<Node::Properties> engine_data)
+ThreadedLoader::load_graph_event(const Glib::ustring&   document_uri,
+                                 optional<Raul::Path>   engine_parent,
+                                 optional<Raul::Symbol> engine_symbol,
+                                 optional<Properties>   engine_data)
 {
 	std::lock_guard<std::mutex> lock(_app.world()->rdf_mutex());
 
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 7870761a..2f12a0e4 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -53,11 +53,11 @@ public:
 
 	~ThreadedLoader();
 
-	void load_graph(bool                              merge,
-	                const Glib::ustring&              document_uri,
-	                boost::optional<Raul::Path>       engine_parent,
-	                boost::optional<Raul::Symbol>     engine_symbol,
-	                boost::optional<Node::Properties> engine_data);
+	void load_graph(bool                          merge,
+	                const Glib::ustring&          document_uri,
+	                boost::optional<Raul::Path>   engine_parent,
+	                boost::optional<Raul::Symbol> engine_symbol,
+	                boost::optional<Properties>   engine_data);
 
 	void save_graph(SPtr<const Client::GraphModel> model,
 	                const std::string&             filename);
@@ -65,10 +65,10 @@ public:
 	SPtr<Parser> parser();
 
 private:
-	void load_graph_event(const Glib::ustring&              document_uri,
-	                      boost::optional<Raul::Path>       engine_parent,
-	                      boost::optional<Raul::Symbol>     engine_symbol,
-	                      boost::optional<Node::Properties> engine_data);
+	void load_graph_event(const Glib::ustring&          document_uri,
+	                      boost::optional<Raul::Path>   engine_parent,
+	                      boost::optional<Raul::Symbol> engine_symbol,
+	                      boost::optional<Properties>   engine_data);
 
 	void save_graph_event(SPtr<const Client::GraphModel> model,
 	                      const std::string&             filename);
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index a8795d6c..814123fb 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -199,7 +199,7 @@ WindowFactory::remove_graph_window(GraphWindow* win, GdkEventAny* ignored)
 
 void
 WindowFactory::present_load_plugin(SPtr<const GraphModel> graph,
-                                   Node::Properties       data)
+                                   Properties             data)
 {
 	_app.request_plugins_if_necessary();
 
@@ -222,7 +222,7 @@ WindowFactory::present_load_plugin(SPtr<const GraphModel> graph,
 
 void
 WindowFactory::present_load_graph(SPtr<const GraphModel> graph,
-                                  Node::Properties       data)
+                                  Properties             data)
 {
 	GraphWindowMap::iterator w = _graph_windows.find(graph->path());
 
@@ -234,7 +234,7 @@ WindowFactory::present_load_graph(SPtr<const GraphModel> graph,
 
 void
 WindowFactory::present_load_subgraph(SPtr<const GraphModel> graph,
-                                     Node::Properties       data)
+                                     Properties             data)
 {
 	GraphWindowMap::iterator w = _graph_windows.find(graph->path());
 
@@ -246,7 +246,7 @@ WindowFactory::present_load_subgraph(SPtr<const GraphModel> graph,
 
 void
 WindowFactory::present_new_subgraph(SPtr<const GraphModel> graph,
-                                    Node::Properties       data)
+                                    Properties             data)
 {
 	GraphWindowMap::iterator w = _graph_windows.find(graph->path());
 
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index d527c0ad..6754dce4 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -64,8 +64,6 @@ public:
 		GraphWindow*                   preferred = NULL,
 		SPtr<GraphView>                view      = SPtr<GraphView>());
 
-	typedef Node::Properties Properties;
-
 	void present_load_plugin(SPtr<const Client::GraphModel> graph, Properties data=Properties());
 	void present_load_graph(SPtr<const Client::GraphModel> graph, Properties data=Properties());
 	void present_load_subgraph(SPtr<const Client::GraphModel> graph, Properties data=Properties());
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index a4aa47fb..1f950089 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -143,10 +143,9 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 		                      *ui->client.get()));
 
 	// Create empty root graph model
-	Ingen::Resource::Properties props;
+	Ingen::Properties props;
 	props.insert(std::make_pair(ui->app->uris().rdf_type,
-	                            Ingen::Resource::Property(
-		                            ui->app->uris().ingen_Graph)));
+	                            Ingen::Property(ui->app->uris().ingen_Graph)));
 	ui->app->store()->put(Ingen::main_uri(), props);
 
 	// Create a GraphBox for the root and set as the UI widget