From 6b6cb56b2ceab509569bfca247f108f2be5e25c0 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 23 Feb 2013 19:55:13 +0000
Subject: Move Atom implementation out of Raul so it can depend on LV2.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5076 a436a847-0d15-0410-975c-d299462d15a1
---
 src/Resource.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/Resource.cpp')

diff --git a/src/Resource.cpp b/src/Resource.cpp
index 1a701eca..a8e96e5d 100644
--- a/src/Resource.cpp
+++ b/src/Resource.cpp
@@ -16,18 +16,18 @@
 
 #include <utility>
 
+#include "ingen/Atom.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/URIs.hpp"
-#include "raul/Atom.hpp"
 
 using namespace std;
 
 namespace Ingen {
 
 void
-Resource::add_property(const Raul::URI&  uri,
-                       const Raul::Atom& value,
-                       Graph             ctx)
+Resource::add_property(const Raul::URI& uri,
+                       const Atom&      value,
+                       Graph            ctx)
 {
 	// Ignore duplicate statements
 	typedef Resource::Properties::const_iterator iterator;
@@ -38,14 +38,14 @@ Resource::add_property(const Raul::URI&  uri,
 		}
 	}
 
-	const Raul::Atom& v = _properties.insert(make_pair(uri, Property(value, ctx)))->second;
+	const Atom& v = _properties.insert(make_pair(uri, Property(value, ctx)))->second;
 	on_property(uri, v);
 }
 
-const Raul::Atom&
-Resource::set_property(const Raul::URI&  uri,
-                       const Raul::Atom& value,
-                       Resource::Graph   ctx)
+const Atom&
+Resource::set_property(const Raul::URI& uri,
+                       const Atom&      value,
+                       Resource::Graph  ctx)
 {
 	// Erase existing property in this context
 	for (Properties::iterator i = _properties.find(uri);
@@ -59,13 +59,13 @@ Resource::set_property(const Raul::URI&  uri,
 	}
 
 	// Insert new property
-	const Raul::Atom& v = _properties.insert(make_pair(uri, Property(value, ctx)))->second;
+	const Atom& v = _properties.insert(make_pair(uri, Property(value, ctx)))->second;
 	on_property(uri, v);
 	return v;
 }
 
 void
-Resource::remove_property(const Raul::URI& uri, const Raul::Atom& value)
+Resource::remove_property(const Raul::URI& uri, const Atom& value)
 {
 	if (value == _uris.wildcard) {
 		_properties.erase(uri);
@@ -82,7 +82,7 @@ Resource::remove_property(const Raul::URI& uri, const Raul::Atom& value)
 }
 
 bool
-Resource::has_property(const Raul::URI& uri, const Raul::Atom& value) const
+Resource::has_property(const Raul::URI& uri, const Atom& value) const
 {
 	Properties::const_iterator i = _properties.find(uri);
 	for (; (i != _properties.end()) && (i->first == uri); ++i) {
@@ -93,16 +93,16 @@ Resource::has_property(const Raul::URI& uri, const Raul::Atom& value) const
 	return false;
 }
 
-const Raul::Atom&
-Resource::set_property(const Raul::URI& uri, const Raul::Atom& value) const
+const Atom&
+Resource::set_property(const Raul::URI& uri, const Atom& value) const
 {
 	return const_cast<Resource*>(this)->set_property(uri, value);
 }
 
-const Raul::Atom&
+const Atom&
 Resource::get_property(const Raul::URI& uri) const
 {
-	static const Raul::Atom nil;
+	static const Atom nil;
 	Properties::const_iterator i = _properties.find(uri);
 	return (i != _properties.end()) ? i->second : nil;
 }
@@ -120,7 +120,7 @@ Resource::type(const URIs&       uris,
 
 	graph = block = port = is_output = false;
 	for (iterator i = types_range.first; i != types_range.second; ++i) {
-		const Raul::Atom& atom = i->second;
+		const Atom& atom = i->second;
 		if (atom.type() != uris.forge.URI && atom.type() != uris.forge.URID) {
 			continue; // Non-URI type, ignore garbage data
 		}
-- 
cgit v1.2.1