summaryrefslogtreecommitdiffstats
path: root/ingen/client/PluginModel.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
committerDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
commit629fb50716083c71146340de97eb8651679ca9fb (patch)
tree9c5f25fdfd24f3cdb89924062f291a6647580878 /ingen/client/PluginModel.hpp
parent6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff)
downloadingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz
ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2
ingen-629fb50716083c71146340de97eb8651679ca9fb.zip
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
Diffstat (limited to 'ingen/client/PluginModel.hpp')
-rw-r--r--ingen/client/PluginModel.hpp19
1 files changed, 9 insertions, 10 deletions
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 <string>
#include <utility>
+#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<PluginUI> ui(Ingen::Shared::World* world,
- SharedPtr<const NodeModel> node) const;
+ SharedPtr<PluginUI> ui(Ingen::World* world,
+ SharedPtr<const NodeModel> node) const;
const std::string& icon_path() const;
static std::string get_lv2_icon_path(const LilvPlugin* plugin);