From 629fb50716083c71146340de97eb8651679ca9fb Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 31 Jul 2012 00:14:50 +0000
Subject: Merge Ingen::Shared namespace into Ingen namespace and core libingen
 library.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1
---
 ingen/Resource.hpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'ingen/Resource.hpp')

diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp
index 4aed2f6d..1e94e1e8 100644
--- a/ingen/Resource.hpp
+++ b/ingen/Resource.hpp
@@ -20,13 +20,12 @@
 #include <map>
 #include <string>
 
+#include "ingen/URIs.hpp"
 #include "raul/Atom.hpp"
 #include "raul/Deletable.hpp"
 #include "raul/URI.hpp"
 #include "raul/log.hpp"
 
-#include "ingen/shared/URIs.hpp"
-
 #define NS_INGEN "http://drobilla.net/ns/ingen#"
 
 namespace Ingen {
@@ -37,7 +36,7 @@ namespace Ingen {
 class Resource : public Raul::Deletable
 {
 public:
-	Resource(Shared::URIs& uris, const Raul::URI& uri)
+	Resource(URIs& uris, const Raul::URI& uri)
 		: _uris(uris)
 		, _uri(uri)
 	{}
@@ -94,7 +93,7 @@ public:
 
 	virtual ~Resource() {}
 
-	Shared::URIs& uris() const { return _uris; }
+	URIs& uris() const { return _uris; }
 
 	virtual void             set_uri(const Raul::URI& uri) { _uri = uri; }
 	virtual const Raul::URI& uri()  const { return _uri; }
@@ -137,17 +136,17 @@ public:
 	 * If some coherent ingen type is found, true is returned and the appropriate
 	 * output parameter set to true.  Otherwise false is returned.
 	 */
-	static bool type(const Shared::URIs& uris,
-	                 const Properties&   properties,
-	                 bool&               patch,
-	                 bool&               node,
-	                 bool&               port,
-	                 bool&               is_output);
+	static bool type(const URIs&       uris,
+	                 const Properties& properties,
+	                 bool&             patch,
+	                 bool&             node,
+	                 bool&             port,
+	                 bool&             is_output);
 
 protected:
 	const Raul::Atom& set_property(const Raul::URI& uri, const Raul::Atom& value) const;
 
-	Shared::URIs& _uris;
+	URIs& _uris;
 
 private:
 	Raul::URI          _uri;
-- 
cgit v1.2.1