Rename 'Loader' 'Parser'.

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

3 files changed, 9 insertions, 12 deletions

diff --git a/src/libs/gui/Configuration.cpp b/src/libs/gui/Configuration.cpp
index 36d5ad75..a442b37c 100644
--- a/src/libs/gui/Configuration.cpp
+++ b/src/libs/gui/Configuration.cpp
@@ -23,13 +23,10 @@
 #include <map>
 #include "client/PortModel.hpp"
 #include "client/PluginModel.hpp"
-#include "client/PatchModel.hpp"
-#include "serialisation/Loader.hpp"
+#include "serialisation/Parser.hpp"
 #include "App.hpp"
 
-using std::cerr; using std::cout; using std::endl;
-using std::map; using std::string;
-using Ingen::Client::PatchModel;
+using namespace std;
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp
index 0247529d..8c8af828 100644
--- a/src/libs/gui/ThreadedLoader.cpp
+++ b/src/libs/gui/ThreadedLoader.cpp
@@ -44,16 +44,16 @@ ThreadedLoader::ThreadedLoader(SharedPtr<EngineInterface> engine)
 		world->serialisation_module = Ingen::Shared::load_module("ingen_serialisation");
 
 	if (world->serialisation_module) {
-		Loader* (*new_loader)() = NULL;
+		Parser* (*new_parser)() = NULL;
 
 		bool found = App::instance().world()->serialisation_module->get_symbol(
-				"new_loader", (void*&)new_loader);
+				"new_parser", (void*&)new_parser);
 
 		if (found)
-			_loader = SharedPtr<Loader>(new_loader());
+			_parser = SharedPtr<Parser>(new_parser());
 	}
 
-	if (_loader)
+	if (_parser)
 		start();
 	else
 		cerr << "WARNING: Failed to load ingen_serialisation module, load disabled." << endl;
@@ -99,7 +99,7 @@ ThreadedLoader::load_patch(bool                    merge,
 				false)));
 	} else {
 		_events.push_back(sigc::hide_return(sigc::bind(
-				sigc::mem_fun(_loader.get(), &Ingen::Serialisation::Loader::load),
+				sigc::mem_fun(_parser.get(), &Ingen::Serialisation::Parser::parse),
 				App::instance().world(),
 				App::instance().world()->engine.get(),
 				data_base_uri,
diff --git a/src/libs/gui/ThreadedLoader.hpp b/src/libs/gui/ThreadedLoader.hpp
index 6c095925..ea4f652d 100644
--- a/src/libs/gui/ThreadedLoader.hpp
+++ b/src/libs/gui/ThreadedLoader.hpp
@@ -29,7 +29,7 @@
 #include "client/PatchModel.hpp"
 #include "client/DeprecatedLoader.hpp"
 #include "serialisation/Serialiser.hpp"
-#include "serialisation/Loader.hpp"
+#include "serialisation/Parser.hpp"
 using std::string;
 using std::list;
 using boost::optional;
@@ -80,7 +80,7 @@ private:
 	void _whipped();
 
 	SharedPtr<EngineInterface> _engine;
-	SharedPtr<Loader>          _loader;
+	SharedPtr<Parser>          _parser;
 
 	DeprecatedLoader _deprecated_loader;
 	Glib::Mutex      _mutex;