5 files changed, 29 insertions, 29 deletions

diff --git a/src/libs/serialisation/Makefile.am b/src/libs/serialisation/Makefile.am
index 3121cec3..57e99055 100644
--- a/src/libs/serialisation/Makefile.am
+++ b/src/libs/serialisation/Makefile.am
@@ -15,8 +15,8 @@ libingen_serialisation_la_LDFLAGS = -no-undefined -module -avoid-version
 libingen_serialisation_la_LIBADD = @RAUL_LIBS@ @REDLANDMM_LIBS@ @GLIBMM_LIBS@ @SLV2_LIBS@
 
 libingen_serialisation_la_SOURCES = \
-	Loader.cpp \
-	Loader.hpp \
+	Parser.cpp \
+	Parser.hpp \
 	Serialiser.cpp \
 	Serialiser.hpp \
 	serialisation.cpp \
diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Parser.cpp
index b0d919e0..8bd9bcbb 100644
--- a/src/libs/serialisation/Loader.cpp
+++ b/src/libs/serialisation/Parser.cpp
@@ -25,7 +25,7 @@
 #include <raul/Atom.hpp>
 #include <raul/AtomRDF.hpp>
 #include "interface/EngineInterface.hpp"
-#include "Loader.hpp"
+#include "Parser.hpp"
 
 using namespace std;
 using namespace Raul;
@@ -35,20 +35,20 @@ namespace Ingen {
 namespace Serialisation {
 
 
-/** Load (create) a patch from RDF into the engine.
+/** Parse a patch from RDF into a CommonInterface (engine or client).
  *
  * @param document_uri URI of file to load objects from.
  * @param parent Path of parent under which to load objects.
  * @return whether or not load was successful.
  */
 bool
-Loader::load(Ingen::Shared::World*           world,
-             Ingen::Shared::CommonInterface* target,
-             const Glib::ustring&            document_uri,
-	         boost::optional<Raul::Path>     parent,
-	         std::string                     patch_name,
-	         Glib::ustring                   patch_uri,
-             GraphObject::Variables          data)
+Parser::parse(Ingen::Shared::World*           world,
+              Ingen::Shared::CommonInterface* target,
+              const Glib::ustring&            document_uri,
+              boost::optional<Raul::Path>     parent,
+              std::string                     patch_name,
+              Glib::ustring                   patch_uri,
+              GraphObject::Variables          data)
 {
 	setlocale(LC_NUMERIC, "C");
 
@@ -63,7 +63,7 @@ Loader::load(Ingen::Shared::World*           world,
 	else
 		patch_uri = string("<") + patch_uri + ">";
 
-	cout << "[Loader] Loading " << patch_uri << endl;
+	cout << "[Parser] Loading " << patch_uri << endl;
 
 	size_t patch_poly = 1;
 	
@@ -82,7 +82,7 @@ Loader::load(Ingen::Shared::World*           world,
 		Redland::Query::Results results = query.run(*world->rdf_world, model);
 
 		if (results.size() == 0) {
-			cerr << "[Loader] ERROR: No polyphony found!" << endl;
+			cerr << "[Parser] ERROR: No polyphony found!" << endl;
 			return false;
 		}
 
@@ -186,7 +186,7 @@ Loader::load(Ingen::Shared::World*           world,
 
 		if (created.find(subpatch_path) == created.end()) {
 			created.insert(subpatch_path);
-			load(world, target, document_uri, patch_path, name, patch);
+			parse(world, target, document_uri, patch_path, name, patch);
 		}
 	}
 
diff --git a/src/libs/serialisation/Loader.hpp b/src/libs/serialisation/Parser.hpp
index 9220e4c9..18d59bf2 100644
--- a/src/libs/serialisation/Loader.hpp
+++ b/src/libs/serialisation/Parser.hpp
@@ -36,17 +36,17 @@ namespace Ingen {
 namespace Serialisation {
 
 
-class Loader {
+class Parser {
 public:
-	virtual ~Loader() {}
+	virtual ~Parser() {}
 	
-	virtual bool load(Ingen::Shared::World*           world,
-	                  Ingen::Shared::CommonInterface* target,
-	                  const Glib::ustring&            uri,
-	                  boost::optional<Raul::Path>     parent,
-	                  std::string                     patch_name,
-	                  Glib::ustring                   patch_uri = "",
-	                  GraphObject::Variables          data = GraphObject::Variables());
+	virtual bool parse(Ingen::Shared::World*           world,
+	                   Ingen::Shared::CommonInterface* target,
+	                   const Glib::ustring&            uri,
+	                   boost::optional<Raul::Path>     parent,
+	                   std::string                     patch_name,
+	                   Glib::ustring                   patch_uri = "",
+	                   GraphObject::Variables          data = GraphObject::Variables());
 };
 
 
diff --git a/src/libs/serialisation/serialisation.cpp b/src/libs/serialisation/serialisation.cpp
index 3ece3772..1d08e76c 100644
--- a/src/libs/serialisation/serialisation.cpp
+++ b/src/libs/serialisation/serialisation.cpp
@@ -18,17 +18,17 @@
 #include CONFIG_H_PATH
 #include "module/World.hpp"
 #include "serialisation.hpp"
-#include "Loader.hpp"
+#include "Parser.hpp"
 #include "Serialiser.hpp"
 
 namespace Ingen {
 namespace Serialisation {
 
 
-Ingen::Serialisation::Loader*
-new_loader()
+Ingen::Serialisation::Parser*
+new_parser()
 {
-	return new Loader();
+	return new Parser();
 }
 
 	
diff --git a/src/libs/serialisation/serialisation.hpp b/src/libs/serialisation/serialisation.hpp
index abae159c..a250945b 100644
--- a/src/libs/serialisation/serialisation.hpp
+++ b/src/libs/serialisation/serialisation.hpp
@@ -24,13 +24,13 @@ namespace Shared { class World; class Store; }
 
 namespace Serialisation {
 
-class Loader;
+class Parser;
 class Serialiser;
 
 
 extern "C" {
 
-	extern Loader*     new_loader();
+	extern Parser*     new_parser();
 	extern Serialiser* new_serialiser(Ingen::Shared::World*    world,
 	                                  SharedPtr<Shared::Store> store);