Add explicit accessors to Quark

8 files changed, 13 insertions, 9 deletions

diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp
index 26f45ef1..cb3c34dc 100644
--- a/src/server/ClientUpdate.cpp
+++ b/src/server/ClientUpdate.cpp
@@ -124,7 +124,7 @@ ClientUpdate::put_preset(const URIs&        uris,
                          const std::string& label)
 {
 	const Properties props{
-		{ uris.rdf_type, uris.pset_Preset.urid },
+		{ uris.rdf_type, uris.pset_Preset.urid_atom() },
 		{ uris.rdfs_label, uris.forge.alloc(label) },
 		{ uris.lv2_appliesTo, uris.forge.make_urid(plugin) }};
 	put(preset, props);
diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp
index 8297e3cc..bc827b54 100644
--- a/src/server/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -69,8 +69,11 @@ DuplexPort::DuplexPort(BufferFactory&      bufs,
 	_is_output = is_output;
 	if (is_output) {
 		if (parent->graph_type() != Node::GraphType::GRAPH) {
-			remove_property(bufs.uris().rdf_type, bufs.uris().lv2_InputPort.urid);
-			add_property(bufs.uris().rdf_type, bufs.uris().lv2_OutputPort.urid);
+			remove_property(bufs.uris().rdf_type,
+			                bufs.uris().lv2_InputPort.urid_atom());
+
+			add_property(bufs.uris().rdf_type,
+			             bufs.uris().lv2_OutputPort.urid_atom());
 		}
 	}
 
diff --git a/src/server/GraphPlugin.hpp b/src/server/GraphPlugin.hpp
index 9e221689..bb97e9c2 100644
--- a/src/server/GraphPlugin.hpp
+++ b/src/server/GraphPlugin.hpp
@@ -37,7 +37,7 @@ public:
 	            const URI&          uri,
 	            const Raul::Symbol& symbol,
 	            const std::string&  name)
-		: PluginImpl(uris, uris.ingen_Graph.urid, uri)
+		: PluginImpl(uris, uris.ingen_Graph.urid_atom(), uri)
 	{}
 
 	BlockImpl* instantiate(BufferFactory&      bufs,
diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp
index 9d02fd99..15df4d60 100644
--- a/src/server/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -52,7 +52,7 @@ InputPort::InputPort(BufferFactory&      bufs,
 	const ingen::URIs& uris = bufs.uris();
 
 	if (parent->graph_type() != Node::GraphType::GRAPH) {
-		add_property(uris.rdf_type, uris.lv2_InputPort.urid);
+		add_property(uris.rdf_type, uris.lv2_InputPort.urid_atom());
 	}
 }
 
diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp
index 8d43a321..be63fa70 100644
--- a/src/server/InternalPlugin.cpp
+++ b/src/server/InternalPlugin.cpp
@@ -33,7 +33,7 @@ using namespace internals;
 InternalPlugin::InternalPlugin(URIs&               uris,
                                const URI&          uri,
                                const Raul::Symbol& symbol)
-	: PluginImpl(uris, uris.ingen_Internal.urid, uri)
+	: PluginImpl(uris, uris.ingen_Internal.urid_atom(), uri)
 	, _symbol(symbol)
 {
 	set_property(uris.rdf_type, uris.ingen_Internal);
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index 01357d8d..1411be1d 100644
--- a/src/server/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -32,7 +32,7 @@ namespace server {
 
 LV2Plugin::LV2Plugin(World& world, const LilvPlugin* lplugin)
 	: PluginImpl(world.uris(),
-	             world.uris().lv2_Plugin.urid,
+	             world.uris().lv2_Plugin.urid_atom(),
 	             URI(lilv_node_as_uri(lilv_plugin_get_uri(lplugin))))
 	, _world(world)
 	, _lilv_plugin(lplugin)
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 87022c27..ab5e4ee8 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -103,7 +103,8 @@ PortImpl::PortImpl(BufferFactory&      bufs,
 
 	if (is_output) {
 		if (_parent->graph_type() != Node::GraphType::GRAPH) {
-			add_property(bufs.uris().rdf_type, bufs.uris().lv2_OutputPort.urid);
+			add_property(bufs.uris().rdf_type,
+			             bufs.uris().lv2_OutputPort.urid_atom());
 		}
 	}
 
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index 3e847bdd..4e031276 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -152,7 +152,7 @@ CreateGraph::pre_process(PreProcessContext& ctx)
 		// Create a new graph
 		_graph = new GraphImpl(_engine, symbol, ext_poly, _parent,
 		                       _engine.sample_rate(), int_poly);
-		_graph->add_property(uris.rdf_type, uris.ingen_Graph.urid);
+		_graph->add_property(uris.rdf_type, uris.ingen_Graph.urid_atom());
 		_graph->add_property(uris.rdf_type,
 		                     Property(uris.ingen_Block,
 		                              Resource::Graph::EXTERNAL));