From 44f7ad5222d824d81dc743045d5887418847e74e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 21 Jan 2018 00:41:34 +0100
Subject: Add URI class and remove use of Raul::URI

---
 src/server/ClientUpdate.hpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/server/ClientUpdate.hpp')

diff --git a/src/server/ClientUpdate.hpp b/src/server/ClientUpdate.hpp
index 008bf2da..f1a361f7 100644
--- a/src/server/ClientUpdate.hpp
+++ b/src/server/ClientUpdate.hpp
@@ -22,7 +22,6 @@
 
 #include "ingen/Resource.hpp"
 #include "raul/Path.hpp"
-#include "raul/URI.hpp"
 
 namespace Ingen {
 
@@ -42,7 +41,7 @@ class PluginImpl;
  * post_process() to avoid the need to lock.
  */
 struct ClientUpdate {
-	void put(const Raul::URI&  uri,
+	void put(const URI&        uri,
 	         const Properties& props,
 	         Resource::Graph   ctx = Resource::Graph::DEFAULT);
 
@@ -51,16 +50,16 @@ struct ClientUpdate {
 	void put_graph(const GraphImpl* graph);
 	void put_plugin(PluginImpl* plugin);
 	void put_preset(const URIs&        uris,
-	                const Raul::URI&   plugin,
-	                const Raul::URI&   preset,
+	                const URI&         plugin,
+	                const URI&         preset,
 	                const std::string& label);
 
-	void del(const Raul::URI& subject);
+	void del(const URI& subject);
 
 	void send(Interface& dest);
 
 	struct Put {
-		Raul::URI       uri;
+		URI             uri;
 		Properties      properties;
 		Resource::Graph ctx;
 	};
@@ -70,9 +69,9 @@ struct ClientUpdate {
 		Raul::Path head;
 	};
 
-	std::vector<Raul::URI> dels;
-	std::vector<Put>       puts;
-	std::vector<Connect>   connects;
+	std::vector<URI>     dels;
+	std::vector<Put>     puts;
+	std::vector<Connect> connects;
 };
 
 } // namespace Server
-- 
cgit v1.2.1