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

2 files changed, 6 insertions, 11 deletions

diff --git a/ingen/serialisation/Parser.hpp b/ingen/serialisation/Parser.hpp
index 0240dc9d..666d9acb 100644
--- a/ingen/serialisation/Parser.hpp
+++ b/ingen/serialisation/Parser.hpp
@@ -33,8 +33,7 @@
 namespace Ingen {
 
 class Interface;
-
-namespace Shared { class World; }
+class World;
 
 namespace Serialisation {
 
@@ -52,7 +51,7 @@ public:
 	typedef GraphObject::Properties Properties;
 
 	virtual bool parse_file(
-		Shared::World*                world,
+		World*                        world,
 		Interface*                    target,
 		Glib::ustring                 path,
 		boost::optional<Raul::Path>   parent = boost::optional<Raul::Path>(),
@@ -60,7 +59,7 @@ public:
 		boost::optional<Properties>   data   = boost::optional<Properties>());
 
 	virtual bool parse_string(
-		Shared::World*                world,
+		World*                        world,
 		Interface*                    target,
 		const Glib::ustring&          str,
 		const Glib::ustring&          base_uri,
diff --git a/ingen/serialisation/Serialiser.hpp b/ingen/serialisation/Serialiser.hpp
index 2dbc99b7..b4c0dfd3 100644
--- a/ingen/serialisation/Serialiser.hpp
+++ b/ingen/serialisation/Serialiser.hpp
@@ -29,14 +29,10 @@
 
 namespace Ingen {
 
-class Plugin;
-class GraphObject;
 class Edge;
-
-namespace Shared {
-class World;
+class GraphObject;
 class Store;
-}
+class World;
 
 namespace Serialisation {
 
@@ -48,7 +44,7 @@ namespace Serialisation {
 class Serialiser
 {
 public:
-	explicit Serialiser(Shared::World& world);
+	explicit Serialiser(World& world);
 	virtual ~Serialiser();
 
 	typedef GraphObject::Properties Properties;