Move Serializer from client lib to serialisation lib (engine or client side serialisation, woot).

git-svn-id: http://svn.drobilla.net/lad/ingen@848 a436a847-0d15-0410-975c-d299462d15a1

7 files changed, 13 insertions, 13 deletions

diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index 9ee32b84..2106c6db 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -42,8 +42,6 @@ libingen_client_la_SOURCES = \
 	PortModel.cpp \
 	PortModel.hpp \
 	PresetModel.hpp \
-	Serializer.cpp \
-	Serializer.hpp \
 	SigClientInterface.hpp \
 	Store.cpp \
 	Store.hpp \
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index 7cd31cb3..f991df8e 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -22,11 +22,11 @@
 #include <flowcanvas/Canvas.hpp>
 #include <flowcanvas/Ellipse.hpp>
 #include "interface/EngineInterface.hpp"
+#include "serialisation/Serializer.hpp"
 #include "client/PluginModel.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
 #include "client/Store.hpp"
-#include "client/Serializer.hpp"
 #include "App.hpp"
 #include "PatchCanvas.hpp"
 #include "PatchWindow.hpp"
@@ -41,7 +41,7 @@
 #include "GladeFactory.hpp"
 #include "WindowFactory.hpp"
 using Ingen::Client::Store;
-using Ingen::Client::Serializer;
+using Ingen::Serialisation::Serializer;
 using Ingen::Client::PluginModel;
 
 namespace Ingen {
diff --git a/src/libs/gui/ThreadedLoader.hpp b/src/libs/gui/ThreadedLoader.hpp
index 08b24faa..8d140c26 100644
--- a/src/libs/gui/ThreadedLoader.hpp
+++ b/src/libs/gui/ThreadedLoader.hpp
@@ -27,8 +27,8 @@
 #include <glibmm/thread.h>
 #include "interface/EngineInterface.hpp"
 #include "client/PatchModel.hpp"
-#include "client/Serializer.hpp"
 #include "client/DeprecatedLoader.hpp"
+#include "serialisation/Serializer.hpp"
 #include "serialisation/Loader.hpp"
 using std::string;
 using std::list;
diff --git a/src/libs/gui/UploadPatchWindow.cpp b/src/libs/gui/UploadPatchWindow.cpp
index 0aaddde8..b804796f 100644
--- a/src/libs/gui/UploadPatchWindow.cpp
+++ b/src/libs/gui/UploadPatchWindow.cpp
@@ -24,7 +24,7 @@
 #include <raul/RDFQuery.hpp>
 #include "module/module.h"
 #include "interface/EngineInterface.hpp"
-#include "client/Serializer.hpp"
+#include "serialisation/Serializer.hpp"
 #include "client/PatchModel.hpp"
 #include "UploadPatchWindow.hpp"
 #include "App.hpp"
diff --git a/src/libs/serialisation/Makefile.am b/src/libs/serialisation/Makefile.am
index eb56ebed..eff5a7a4 100644
--- a/src/libs/serialisation/Makefile.am
+++ b/src/libs/serialisation/Makefile.am
@@ -9,8 +9,10 @@ libingen_serialisation_la_LDFLAGS = -no-undefined -module -avoid-version
 libingen_serialisation_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@
 
 libingen_serialisation_la_SOURCES = \
-	serialisation.hpp \
-	serialisation.cpp \
+	Loader.cpp \
 	Loader.hpp \
-	Loader.cpp
+	Serializer.cpp \
+	Serializer.hpp \
+	serialisation.cpp \
+	serialisation.hpp
 
diff --git a/src/libs/client/Serializer.cpp b/src/libs/serialisation/Serializer.cpp
index e15ce4dc..7483ae5e 100644
--- a/src/libs/client/Serializer.cpp
+++ b/src/libs/serialisation/Serializer.cpp
@@ -49,7 +49,7 @@ using namespace Ingen;
 using namespace Ingen::Shared;
 
 namespace Ingen {
-namespace Client {
+namespace Serialisation {
 
 
 Serializer::Serializer(Raul::RDF::World& world)
@@ -430,5 +430,5 @@ Serializer::serialize_connection(SharedPtr<Connection> connection) throw (std::l
 }
 
 
-} // namespace Client
+} // namespace Serialisation
 } // namespace Ingen
diff --git a/src/libs/client/Serializer.hpp b/src/libs/serialisation/Serializer.hpp
index f8b99750..ead392bc 100644
--- a/src/libs/client/Serializer.hpp
+++ b/src/libs/serialisation/Serializer.hpp
@@ -43,7 +43,7 @@ namespace Shared {
 	class Connection;
 }
 
-namespace Client {
+namespace Serialisation {
 
 
 /** Serializes Ingen objects (patches, nodes, etc) to RDF.
@@ -90,7 +90,7 @@ private:
 };
 
 
-} // namespace Client
+} // namespace Serialisation
 } // namespace Ingen
 
 #endif // SERIALIZER_H