1 files changed, 31 insertions, 29 deletions

diff --git a/src/serialisation/Serialiser.hpp b/src/serialisation/Serialiser.hpp
index 90c49c55..fc26c387 100644
--- a/src/serialisation/Serialiser.hpp
+++ b/src/serialisation/Serialiser.hpp
@@ -34,15 +34,14 @@
 
 namespace Ingen {
 
-namespace Shared {
 class Plugin;
 class GraphObject;
 class Patch;
 class Node;
 class Port;
 class Connection;
-class World;
-}
+
+namespace Shared { class World; }
 
 namespace Serialisation {
 
@@ -55,22 +54,25 @@ class Serialiser
 public:
 	Serialiser(Shared::World& world, SharedPtr<Shared::Store> store);
 
-	typedef Shared::GraphObject::Properties Properties;
+	typedef GraphObject::Properties Properties;
+
+	void to_file(SharedPtr<GraphObject> object,
+	             const std::string&     filename);
+
+	void write_bundle(SharedPtr<Patch>   patch,
+	                  const std::string& uri);
 
-	void to_file(SharedPtr<Shared::GraphObject> object,
-	             const std::string&             filename);
+	std::string to_string(SharedPtr<GraphObject> object,
+	                      const std::string&     base_uri,
+	                      const Properties&      extra_rdf);
 
-	void write_bundle(SharedPtr<Shared::Patch> patch,
-	                  const std::string&       uri);
+	void start_to_string(const Raul::Path&  root,
+	                     const std::string& base_uri);
 
-	std::string to_string(SharedPtr<Shared::GraphObject> object,
-	                      const std::string&             base_uri,
-	                      const Properties&              extra_rdf);
+	void serialise(SharedPtr<GraphObject> object) throw (std::logic_error);
 
-	void start_to_string(const Raul::Path& root, const std::string& base_uri);
-	void serialise(SharedPtr<Shared::GraphObject> object) throw (std::logic_error);
-	void serialise_connection(const Sord::Node&             parent,
-	                          SharedPtr<Shared::Connection> c) throw (std::logic_error);
+	void serialise_connection(const Sord::Node&     parent,
+	                          SharedPtr<Connection> c) throw (std::logic_error);
 
 	std::string finish();
 
@@ -79,26 +81,26 @@ private:
 
 	void start_to_filename(const std::string& filename);
 
-	void serialise_patch(SharedPtr<Shared::Patch> p,
-	                     const Sord::Node&        id);
+	void serialise_patch(SharedPtr<Patch>  p,
+	                     const Sord::Node& id);
 
-	void serialise_node(SharedPtr<Shared::Node> n,
-	                    const Sord::Node&       class_id,
-	                    const Sord::Node&       id);
+	void serialise_node(SharedPtr<Node>   n,
+	                    const Sord::Node& class_id,
+	                    const Sord::Node& id);
 
-	void serialise_port(const Shared::Port*     p,
-	                    Shared::Resource::Graph context,
-	                    const Sord::Node&       id);
+	void serialise_port(const Port*       p,
+	                    Resource::Graph   context,
+	                    const Sord::Node& id);
 
-	void serialise_properties(const Shared::GraphObject* o,
-	                          Shared::Resource::Graph    context,
-	                          Sord::Node                 id);
+	void serialise_properties(const GraphObject* o,
+	                          Resource::Graph    context,
+	                          Sord::Node         id);
 
 	Sord::Node path_rdf_node(const Raul::Path& path);
 
-	void write_manifest(const std::string&       bundle_path,
-	                    SharedPtr<Shared::Patch> patch,
-	                    const std::string&       patch_symbol);
+	void write_manifest(const std::string& bundle_path,
+	                    SharedPtr<Patch>   patch,
+	                    const std::string& patch_symbol);
 
 	Raul::Path               _root_path;
 	SharedPtr<Shared::Store> _store;