Add const find interface to Raul::Table, fix bugs.

Use Raul::Table on Ingen client side instead of std::map for objects, plugins.
Work on renaming (still broken).


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

2 files changed, 5 insertions, 4 deletions

diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp
index c14c8a1f..806dbfc3 100644
--- a/src/libs/serialisation/Loader.cpp
+++ b/src/libs/serialisation/Loader.cpp
@@ -20,6 +20,7 @@
 #include <glibmm/ustring.h>
 #include <raul/RDFModel.hpp>
 #include <raul/RDFQuery.hpp>
+#include <raul/TableImpl.hpp>
 #include "interface/EngineInterface.hpp"
 #include "Loader.hpp"
 
@@ -44,13 +45,13 @@ Loader::load(SharedPtr<EngineInterface> engine,
              boost::optional<Path>      parent,
              string                     patch_name,
              Glib::ustring              patch_uri,
-             map<string,Atom>           data)
+             Raul::Table<string, Atom>  data)
 {
 	setlocale(LC_NUMERIC, "C");
 
 	// FIXME: this whole thing is a mess
 	
-	std::map<Path, bool> created;
+	Raul::Table<Path, bool> created;
 
 	RDF::Model model(*rdf_world, document_uri);
 
diff --git a/src/libs/serialisation/Loader.hpp b/src/libs/serialisation/Loader.hpp
index b729e71d..87465880 100644
--- a/src/libs/serialisation/Loader.hpp
+++ b/src/libs/serialisation/Loader.hpp
@@ -19,12 +19,12 @@
 #define LOADER_H
 
 #include <string>
-#include <map>
 #include <glibmm/ustring.h>
 #include <boost/optional.hpp>
 #include <raul/SharedPtr.hpp>
 #include <raul/Path.hpp>
 #include <raul/Atom.hpp>
+#include <raul/Table.hpp>
 
 namespace Raul { class Atom; namespace RDF { class World; } }
 namespace Ingen { namespace Shared { class EngineInterface; } }
@@ -37,7 +37,7 @@ class Loader {
 public:
 	virtual ~Loader() {}
 	
-	typedef std::map<std::string, Raul::Atom> Metadata;
+	typedef Raul::Table<std::string, Raul::Atom> Metadata;
 	
 	virtual bool
 	load(SharedPtr<Ingen::Shared::EngineInterface> engine,