Merge Resource and ResourceImpl, eliminating more virtual inheritance.

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

3 files changed, 8 insertions, 8 deletions

diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 75acef63..56d94b2e 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -279,8 +279,8 @@ ClientStore::put(const Raul::URI&            uri,
 #endif
 
 	bool is_patch, is_node, is_port, is_output;
-	ResourceImpl::type(uris(), properties,
-	                   is_patch, is_node, is_port, is_output);
+	Resource::type(uris(), properties,
+	               is_patch, is_node, is_port, is_output);
 
 	// Check if uri is a plugin
 	Iterator t = properties.find(_uris.rdf_type);
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index e7e7a5d8..9a5009ba 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -23,14 +23,14 @@ namespace Ingen {
 namespace Client {
 
 ObjectModel::ObjectModel(Shared::URIs& uris, const Raul::Path& path)
-	: ResourceImpl(uris, path)
+	: GraphObject(uris, path)
 	, _path(path)
 	, _symbol((path == Raul::Path::root()) ? "root" : path.symbol())
 {
 }
 
 ObjectModel::ObjectModel(const ObjectModel& copy)
-	: ResourceImpl(copy)
+	: GraphObject(copy)
 	, _parent(copy._parent)
 	, _path(copy._path)
 	, _symbol(copy._symbol)
@@ -82,7 +82,7 @@ ObjectModel::set(SharedPtr<ObjectModel> o)
 
 	for (Properties::const_iterator v = o->properties().begin();
 	     v != o->properties().end(); ++v) {
-		ResourceImpl::set_property(v->first, v->second);
+		Resource::set_property(v->first, v->second);
 		_signal_property.emit(v->first, v->second);
 	}
 }
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index e3ac9273..f4df6d1c 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -44,7 +44,7 @@ PluginModel::PluginModel(Shared::URIs&               uris,
                          const Raul::URI&            uri,
                          const Raul::URI&            type_uri,
                          const Resource::Properties& properties)
-	: ResourceImpl(uris, uri)
+	: Plugin(uris, uri)
 	, _type(type_from_uri(type_uri.str()))
 {
 	add_properties(properties);
@@ -66,7 +66,7 @@ const Raul::Atom&
 PluginModel::get_property(const Raul::URI& key) const
 {
 	static const Raul::Atom nil;
-	const Raul::Atom& val = ResourceImpl::get_property(key);
+	const Raul::Atom& val = Resource::get_property(key);
 	if (val.is_valid())
 		return val;
 
@@ -145,7 +145,7 @@ PluginModel::set(SharedPtr<PluginModel> p)
 	for (Properties::const_iterator v = p->properties().begin();
 	     v != p->properties().end();
 	     ++v) {
-		ResourceImpl::set_property(v->first, v->second);
+		Resource::set_property(v->first, v->second);
 		_signal_property.emit(v->first, v->second);
 	}