From 9088edb2534a616b757197662d77abcb0291470b Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 30 Jul 2012 23:22:44 +0000
Subject: Merge Resource and ResourceImpl, eliminating more virtual
 inheritance.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4577 a436a847-0d15-0410-975c-d299462d15a1
---
 ingen/GraphObject.hpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ingen/GraphObject.hpp')

diff --git a/ingen/GraphObject.hpp b/ingen/GraphObject.hpp
index a0d5ec22..a8bee0b0 100644
--- a/ingen/GraphObject.hpp
+++ b/ingen/GraphObject.hpp
@@ -19,6 +19,7 @@
 
 #include "ingen/Resource.hpp"
 #include "raul/Deletable.hpp"
+#include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
 
 namespace Raul {
@@ -36,8 +37,7 @@ class Plugin;
  *
  * @ingroup Ingen
  */
-class GraphObject : public Raul::Deletable
-                  , public virtual Resource
+class GraphObject : public Resource
 {
 public:
 	virtual void set_path(const Raul::Path& path) = 0;
@@ -67,6 +67,10 @@ public:
 	virtual GraphObject*        graph_parent() const = 0;
 
 protected:
+	GraphObject(Shared::URIs& uris, const Raul::Path& path)
+		: Resource(uris, path)
+	{}
+
 	Edges _edges;  ///< Patches only
 };
 
-- 
cgit v1.2.1