From 9088edb2534a616b757197662d77abcb0291470b Mon Sep 17 00:00:00 2001 From: David Robillard 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/client/ObjectModel.hpp | 5 ++--- ingen/client/PluginModel.hpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'ingen/client') diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp index 2d060a0e..2ff8f898 100644 --- a/ingen/client/ObjectModel.hpp +++ b/ingen/client/ObjectModel.hpp @@ -30,8 +30,8 @@ #include "raul/URI.hpp" #include "ingen/GraphObject.hpp" +#include "ingen/Resource.hpp" #include "ingen/client/signal.hpp" -#include "ingen/shared/ResourceImpl.hpp" namespace Ingen { @@ -52,8 +52,7 @@ class ClientStore; * * @ingroup IngenClient */ -class ObjectModel : virtual public GraphObject - , public Ingen::Shared::ResourceImpl +class ObjectModel : public GraphObject { public: virtual ~ObjectModel(); diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp index 395157ae..0449cb51 100644 --- a/ingen/client/PluginModel.hpp +++ b/ingen/client/PluginModel.hpp @@ -26,10 +26,10 @@ #include "raul/Symbol.hpp" #include "sord/sordmm.hpp" -#include "ingen/Plugin.hpp" #include "ingen/Interface.hpp" +#include "ingen/Plugin.hpp" +#include "ingen/Resource.hpp" #include "ingen/client/signal.hpp" -#include "ingen/shared/ResourceImpl.hpp" #include "ingen/shared/World.hpp" namespace Ingen { @@ -47,7 +47,6 @@ class PluginUI; * @ingroup IngenClient */ class PluginModel : public Ingen::Plugin - , public Ingen::Shared::ResourceImpl { public: PluginModel(Shared::URIs& uris, -- cgit v1.2.1