Update for latest Raul.

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

12 files changed, 31 insertions, 25 deletions

diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp
index ebfece4c..63c86028 100644
--- a/ingen/AtomWriter.hpp
+++ b/ingen/AtomWriter.hpp
@@ -36,7 +36,9 @@ public:
 	AtomWriter(URIMap& map, URIs& uris, AtomSink& sink);
 	~AtomWriter() {}
 
-	Raul::URI uri() const { return "http://drobilla.net/ns/ingen#AtomWriter"; }
+	Raul::URI uri() const {
+		return Raul::URI("http://drobilla.net/ns/ingen#AtomWriter");
+	}
 
 	void bundle_begin();
 
diff --git a/ingen/ClashAvoider.hpp b/ingen/ClashAvoider.hpp
index 66b860c2..db3c1b60 100644
--- a/ingen/ClashAvoider.hpp
+++ b/ingen/ClashAvoider.hpp
@@ -44,7 +44,7 @@ public:
 	ClashAvoider(Store& store, Interface& target, Store* also_avoid=NULL)
 		: _store(store), _target(target), _also_avoid(also_avoid) {}
 
-	Raul::URI uri() const { return "ingen:ClientStore"; }
+	Raul::URI uri() const { return Raul::URI("ingen:ClientStore"); }
 
 	void set_target(Interface& target) { _target = target; }
 
diff --git a/ingen/GraphObject.hpp b/ingen/GraphObject.hpp
index fef73c6e..048aaebd 100644
--- a/ingen/GraphObject.hpp
+++ b/ingen/GraphObject.hpp
@@ -66,15 +66,17 @@ public:
 	static Raul::URI root_uri() { return Raul::URI("ingen:root"); }
 
 	static bool uri_is_path(const Raul::URI& uri) {
-		return uri.substr(0, root_uri().length()) == root_uri().str();
+		return uri.substr(0, root_uri().length()) == root_uri();
 	}
 
 	static Raul::Path uri_to_path(const Raul::URI& uri) {
-		return (uri == root_uri()) ? "/" : uri.substr(root_uri().length());
+		return (uri == root_uri())
+			? Raul::Path("/")
+			: Raul::Path(uri.substr(root_uri().length()));
 	}
 
 	static Raul::URI path_to_uri(const Raul::Path& path) {
-		return Raul::URI(root_uri().str() + path.c_str());
+		return Raul::URI(root_uri() + path.c_str());
 	}
 
 protected:
diff --git a/ingen/Plugin.hpp b/ingen/Plugin.hpp
index 544a2aad..6b0ac63a 100644
--- a/ingen/Plugin.hpp
+++ b/ingen/Plugin.hpp
@@ -41,10 +41,10 @@ public:
 
 	static inline const Raul::URI& type_uri(Type type) {
 		static const Raul::URI uris[] = {
-			"http://drobilla.net/ns/ingen#nil",
-			LV2_CORE__Plugin,
-			"http://drobilla.net/ns/ingen#Internal",
-			"http://drobilla.net/ns/ingen#Patch"
+			Raul::URI("http://drobilla.net/ns/ingen#nil"),
+			Raul::URI(LV2_CORE__Plugin),
+			Raul::URI("http://drobilla.net/ns/ingen#Internal"),
+			Raul::URI("http://drobilla.net/ns/ingen#Patch")
 		};
 
 		return uris[type];
diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp
index feb905fb..92f253cd 100644
--- a/ingen/Resource.hpp
+++ b/ingen/Resource.hpp
@@ -49,9 +49,9 @@ public:
 
 	static Raul::URI graph_to_uri(Graph g) {
 		switch (g) {
-		case DEFAULT:  return NS_INGEN "defaultContext";
-		case EXTERNAL: return NS_INGEN "externalContext";
-		case INTERNAL: return NS_INGEN "internalContext";
+		case DEFAULT:  return Raul::URI(NS_INGEN "defaultContext");
+		case EXTERNAL: return Raul::URI(NS_INGEN "externalContext");
+		case INTERNAL: return Raul::URI(NS_INGEN "internalContext");
 		}
 	}
 
diff --git a/ingen/Store.hpp b/ingen/Store.hpp
index 2f5afa1e..ded18608 100644
--- a/ingen/Store.hpp
+++ b/ingen/Store.hpp
@@ -43,7 +43,7 @@ public:
 	const_iterator children_end(SharedPtr<const GraphObject> o) const;
 
 	SharedPtr<GraphObject> find_child(SharedPtr<const GraphObject> parent,
-	                                  const std::string&           child_name) const;
+	                                  const Raul::Symbol&          symbol) const;
 
 	unsigned child_name_offset(const Raul::Path&   parent,
 	                           const Raul::Symbol& symbol,
diff --git a/ingen/World.hpp b/ingen/World.hpp
index 5d2bddda..68ecd843 100644
--- a/ingen/World.hpp
+++ b/ingen/World.hpp
@@ -22,6 +22,7 @@
 #include "lv2/lv2plug.in/ns/ext/urid/urid.h"
 #include "raul/Noncopyable.hpp"
 #include "raul/SharedPtr.hpp"
+#include "raul/URI.hpp"
 
 typedef struct LilvWorldImpl LilvWorld;
 
@@ -93,7 +94,7 @@ public:
 	/** A function to create a new remote Interface. */
 	typedef SharedPtr<Interface> (*InterfaceFactory)(
 		World*               world,
-		const std::string&   engine_url,
+		const Raul::URI&     engine_uri,
 		SharedPtr<Interface> respondee);
 
 	/** Register an InterfaceFactory (for module implementations). */
@@ -106,7 +107,7 @@ public:
 	 *                  and broadcasts, if applicable.
 	 */
 	virtual SharedPtr<Interface> new_interface(
-		const std::string&   engine_url,
+		const Raul::URI&     engine_uri,
 		SharedPtr<Interface> respondee);
 
 	/** Run a script. */
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index 720164d0..3762dcb0 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -59,7 +59,7 @@ public:
 		SharedPtr<Interface>          engine  = SharedPtr<Interface>(),
 		SharedPtr<SigClientInterface> emitter = SharedPtr<SigClientInterface>());
 
-	Raul::URI uri() const { return "ingen:ClientStore"; }
+	Raul::URI uri() const { return Raul::URI("ingen:clientStore"); }
 
 	SharedPtr<const ObjectModel> object(const Raul::Path& path) const;
 	SharedPtr<const PluginModel> plugin(const Raul::URI& uri)   const;
diff --git a/ingen/client/PatchModel.hpp b/ingen/client/PatchModel.hpp
index 64ef3d18..d4c8f511 100644
--- a/ingen/client/PatchModel.hpp
+++ b/ingen/client/PatchModel.hpp
@@ -54,7 +54,8 @@ private:
 	friend class ClientStore;
 
 	PatchModel(URIs& uris, const Raul::Path& patch_path)
-		: NodeModel(uris, "http://drobilla.net/ns/ingen#Patch", patch_path)
+		: NodeModel(
+			uris, Raul::URI("http://drobilla.net/ns/ingen#Patch"), patch_path)
 	{
 	}
 
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index 1a5a31be..a59de578 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -54,13 +54,13 @@ public:
 
 	bool port_property(const Raul::URI& uri) const;
 
-	bool is_logarithmic() const { return port_property(LV2_PORT_PROPS__logarithmic); }
-	bool is_enumeration() const { return port_property(LV2_CORE__enumeration); }
-	bool is_integer()     const { return port_property(LV2_CORE__integer); }
-	bool is_toggle()      const { return port_property(LV2_CORE__toggled); }
+	bool is_logarithmic() const { return port_property(Raul::URI(LV2_PORT_PROPS__logarithmic)); }
+	bool is_enumeration() const { return port_property(Raul::URI(LV2_CORE__enumeration)); }
+	bool is_integer()     const { return port_property(Raul::URI(LV2_CORE__integer)); }
+	bool is_toggle()      const { return port_property(Raul::URI(LV2_CORE__toggled)); }
 	bool is_numeric()     const {
-		return ObjectModel::is_a(LV2_CORE__ControlPort)
-			|| ObjectModel::is_a(LV2_CORE__CVPort);
+		return ObjectModel::is_a(Raul::URI(LV2_CORE__ControlPort))
+			|| ObjectModel::is_a(Raul::URI(LV2_CORE__CVPort));
 	}
 
 	inline bool operator==(const PortModel& pm) const { return (path() == pm.path()); }
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 4aef5a40..a330d31e 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -45,7 +45,7 @@ class SigClientInterface : public Ingen::Interface,
 public:
 	SigClientInterface() {}
 
-	Raul::URI uri() const { return "http://drobilla.net/ns/ingen#internal"; }
+	Raul::URI uri() const { return Raul::URI("ingen:sigClient"); }
 
 	INGEN_SIGNAL(response, void, int32_t, Status, std::string)
 	INGEN_SIGNAL(bundle_begin, void)
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index c321f438..a6028cc6 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -65,7 +65,7 @@ public:
 		, property_change_slot(_signal_property_change.make_slot())
 	{}
 
-	virtual Raul::URI uri() const { return "http://drobilla.net/ns/ingen#internal"; }
+	virtual Raul::URI uri() const { return Raul::URI("ingen:threadedSigClient"); }
 
 	void bundle_begin()
 		{ push_sig(bundle_begin_slot); }