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

7 files changed, 32 insertions, 34 deletions

diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index b5a51a83..720164d0 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -23,7 +23,7 @@
 
 #include "ingen/Interface.hpp"
 #include "ingen/client/signal.hpp"
-#include "ingen/shared/Store.hpp"
+#include "ingen/Store.hpp"
 #include "raul/Path.hpp"
 #include "raul/PathTable.hpp"
 #include "raul/SharedPtr.hpp"
@@ -33,7 +33,7 @@ namespace Raul { class Atom; }
 
 namespace Ingen {
 
-namespace Shared { class URIs; }
+class URIs;
 
 class GraphObject;
 
@@ -50,12 +50,12 @@ class SigClientInterface;
  *
  * @ingroup IngenClient
  */
-class ClientStore : public Shared::Store
+class ClientStore : public Store
                   , public Interface
                   , public INGEN_TRACKABLE {
 public:
 	ClientStore(
-		Shared::URIs&                 uris,
+		URIs&                         uris,
 		SharedPtr<Interface>          engine  = SharedPtr<Interface>(),
 		SharedPtr<SigClientInterface> emitter = SharedPtr<SigClientInterface>());
 
@@ -72,7 +72,7 @@ public:
 	SharedPtr<Plugins>       plugins()                         { return _plugins; }
 	void                     set_plugins(SharedPtr<Plugins> p) { _plugins = p; }
 
-	Shared::URIs& uris() { return _uris; }
+	URIs& uris() { return _uris; }
 
 	void put(const Raul::URI&            uri,
 	         const Resource::Properties& properties,
@@ -130,7 +130,7 @@ private:
 	bool attempt_connection(const Raul::Path& tail_path,
 	                        const Raul::Path& head_path);
 
-	Shared::URIs&                 _uris;
+	URIs&                         _uris;
 	SharedPtr<Interface>          _engine;
 	SharedPtr<SigClientInterface> _emitter;
 
diff --git a/ingen/client/NodeModel.hpp b/ingen/client/NodeModel.hpp
index 07810eed..93a512f0 100644
--- a/ingen/client/NodeModel.hpp
+++ b/ingen/client/NodeModel.hpp
@@ -31,7 +31,7 @@ namespace Raul { class Path; }
 
 namespace Ingen {
 
-namespace Shared { class URIs; }
+class URIs;
 
 namespace Client {
 
@@ -79,10 +79,10 @@ public:
 protected:
 	friend class ClientStore;
 
-	NodeModel(Shared::URIs&          uris,
-	          const Raul::URI&       plugin_uri,
-	          const Raul::Path&      path);
-	NodeModel(Shared::URIs&          uris,
+	NodeModel(URIs&             uris,
+	          const Raul::URI&  plugin_uri,
+	          const Raul::Path& path);
+	NodeModel(URIs&                  uris,
 	          SharedPtr<PluginModel> plugin,
 	          const Raul::Path&      path);
 	explicit NodeModel(const Raul::Path& path);
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index 2ff8f898..69ad3e22 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -35,7 +35,7 @@
 
 namespace Ingen {
 
-namespace Shared { class URIs; }
+class URIs;
 
 namespace Client {
 
@@ -80,7 +80,7 @@ public:
 protected:
 	friend class ClientStore;
 
-	ObjectModel(Shared::URIs& uris, const Raul::Path& path);
+	ObjectModel(URIs& uris, const Raul::Path& path);
 	ObjectModel(const ObjectModel& copy);
 
 	virtual void set_path(const Raul::Path& p);
diff --git a/ingen/client/PatchModel.hpp b/ingen/client/PatchModel.hpp
index 1ad55c78..64ef3d18 100644
--- a/ingen/client/PatchModel.hpp
+++ b/ingen/client/PatchModel.hpp
@@ -53,7 +53,7 @@ public:
 private:
 	friend class ClientStore;
 
-	PatchModel(Shared::URIs& uris, const Raul::Path& patch_path)
+	PatchModel(URIs& uris, const Raul::Path& patch_path)
 		: NodeModel(uris, "http://drobilla.net/ns/ingen#Patch", patch_path)
 	{
 	}
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);
diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp
index 25422fe8..1c45bd56 100644
--- a/ingen/client/PluginUI.hpp
+++ b/ingen/client/PluginUI.hpp
@@ -23,13 +23,12 @@
 
 #include "suil/suil.h"
 
-#include "ingen/shared/LV2Features.hpp"
+#include "ingen/LV2Features.hpp"
 
 namespace Ingen {
 
 class Interface;
-
-namespace Shared { class World; }
+class World;
 
 namespace Client {
 
@@ -43,7 +42,7 @@ class PluginUI {
 public:
 	~PluginUI();
 
-	static SharedPtr<PluginUI> create(Ingen::Shared::World*      world,
+	static SharedPtr<PluginUI> create(Ingen::World*              world,
 	                                  SharedPtr<const NodeModel> node,
 	                                  const LilvPlugin*          plugin);
 
@@ -56,22 +55,22 @@ public:
 
 	bool is_resizable() const;
 
-	Ingen::Shared::World*       world() const { return _world; }
-	SharedPtr<const NodeModel>  node()  const { return _node; }
+	Ingen::World*              world() const { return _world; }
+	SharedPtr<const NodeModel> node()  const { return _node; }
 
 private:
-	PluginUI(Ingen::Shared::World*      world,
+	PluginUI(Ingen::World*              world,
 	         SharedPtr<const NodeModel> node,
 	         const LilvNode*            ui_node);
 
-	Ingen::Shared::World*      _world;
+	Ingen::World*              _world;
 	SharedPtr<const NodeModel> _node;
 	SuilInstance*              _instance;
 	LilvNode*                  _ui_node;
 
 	static SuilHost* ui_host;
 
-	SharedPtr<Shared::LV2Features::FeatureArray> _features;
+	SharedPtr<LV2Features::FeatureArray> _features;
 };
 
 } // namespace Client
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index 99cd85be..1a5a31be 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -89,7 +89,7 @@ public:
 private:
 	friend class ClientStore;
 
-	PortModel(Shared::URIs&     uris,
+	PortModel(URIs&             uris,
 	          const Raul::Path& path,
 	          uint32_t          index,
 	          Direction         dir)