From 629fb50716083c71146340de97eb8651679ca9fb Mon Sep 17 00:00:00 2001 From: David Robillard 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/client/PluginModel.hpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'ingen/client/PluginModel.hpp') diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp index 0449cb51..13375c95 100644 --- a/ingen/client/PluginModel.hpp +++ b/ingen/client/PluginModel.hpp @@ -21,20 +21,19 @@ #include #include +#include "ingen/Plugin.hpp" +#include "ingen/Resource.hpp" +#include "ingen/Resource.hpp" +#include "ingen/World.hpp" +#include "ingen/client/signal.hpp" #include "lilv/lilv.h" #include "raul/SharedPtr.hpp" #include "raul/Symbol.hpp" #include "sord/sordmm.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Plugin.hpp" -#include "ingen/Resource.hpp" -#include "ingen/client/signal.hpp" -#include "ingen/shared/World.hpp" - namespace Ingen { -namespace Shared { class URIs; } +class URIs; namespace Client { @@ -49,7 +48,7 @@ class PluginUI; class PluginModel : public Ingen::Plugin { public: - PluginModel(Shared::URIs& uris, + PluginModel(URIs& uris, const Raul::URI& uri, const Raul::URI& type_uri, const Ingen::Resource::Properties& properties); @@ -75,8 +74,8 @@ public: bool has_ui() const; - SharedPtr ui(Ingen::Shared::World* world, - SharedPtr node) const; + SharedPtr ui(Ingen::World* world, + SharedPtr node) const; const std::string& icon_path() const; static std::string get_lv2_icon_path(const LilvPlugin* plugin); -- cgit v1.2.1