1 files changed, 19 insertions, 24 deletions

diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index 4d02e546..230a030e 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -20,22 +20,17 @@
 
 #include <cstdlib>
 #include <iostream>
-#include <string>
 #include <algorithm>
 #include <cassert>
 #include <boost/utility.hpp>
 #include <sigc++/sigc++.h>
 #include "raul/Atom.hpp"
 #include "raul/Path.hpp"
+#include "raul/URI.hpp"
 #include "raul/SharedPtr.hpp"
 #include "interface/GraphObject.hpp"
 #include "shared/ResourceImpl.hpp"
 
-using std::string;
-using Raul::Atom;
-using Raul::Path;
-using Raul::Symbol;
-
 namespace Ingen {
 namespace Client {
 
@@ -59,50 +54,50 @@ class ObjectModel : virtual public Ingen::Shared::GraphObject
 public:
 	virtual ~ObjectModel();
 
-	const Atom& get_variable(const string& key) const;
-	Atom&       get_variable(string& key);
+	const Raul::Atom& get_variable(const Raul::URI& key) const;
+	Raul::Atom&       get_variable(Raul::URI& key);
 	
-	virtual void set_property(const string& key, const Atom& value) {
+	virtual void set_property(const Raul::URI& key, const Raul::Atom& value) {
 		ResourceImpl::set_property(key, value);
 		signal_property.emit(key, value);
 	}
 	
-	virtual void set_variable(const string& key, const Atom& value)
+	virtual void set_variable(const Raul::URI& key, const Raul::Atom& value)
 		{ _variables[key] = value; signal_variable.emit(key, value); }
 
-	const Properties&       variables()  const { return _variables; }
-	Properties&             variables()        { return _variables; }
-	const Path             path()       const { return _path; }
-	const Symbol           symbol()     const { return _path.name(); }
+	const Properties&      variables()  const { return _variables; }
+	Properties&            variables()        { return _variables; }
+	const Raul::Path       path()       const { return _path; }
+	const Raul::Symbol     symbol()     const { return _path.name(); }
 	SharedPtr<ObjectModel> parent()     const { return _parent; }
 	bool                   polyphonic() const;
 	
 	GraphObject* graph_parent() const { return _parent.get(); }
 
 	// Signals
-	sigc::signal<void, SharedPtr<ObjectModel> >    signal_new_child; 
-	sigc::signal<void, SharedPtr<ObjectModel> >    signal_removed_child; 
-	sigc::signal<void, const string&, const Atom&> signal_variable; 
-	sigc::signal<void, const string&, const Atom&> signal_property; 
-	sigc::signal<void>                             signal_destroyed; 
-	sigc::signal<void>                             signal_renamed; 
+	sigc::signal<void, SharedPtr<ObjectModel> >             signal_new_child; 
+	sigc::signal<void, SharedPtr<ObjectModel> >             signal_removed_child; 
+	sigc::signal<void, const Raul::URI&, const Raul::Atom&> signal_variable; 
+	sigc::signal<void, const Raul::URI&, const Raul::Atom&> signal_property; 
+	sigc::signal<void>                                      signal_destroyed; 
+	sigc::signal<void>                                      signal_renamed; 
 
 protected:
 	friend class ClientStore;
 	
-	ObjectModel(const Path& path);
+	ObjectModel(const Raul::Path& path);
 	
-	virtual void set_path(const Path& p) { _path = p; signal_renamed.emit(); }
+	virtual void set_path(const Raul::Path& p) { _path = p; signal_renamed.emit(); }
 	virtual void set_parent(SharedPtr<ObjectModel> p) { assert(p); _parent = p; }
 	virtual void add_child(SharedPtr<ObjectModel> c) {}
 	virtual bool remove_child(SharedPtr<ObjectModel> c) { return true; }
 
 	virtual void set(SharedPtr<ObjectModel> model);
 
-	Path                   _path;
+	Raul::Path             _path;
 	SharedPtr<ObjectModel> _parent;
 	
-	Properties  _variables;
+	Properties _variables;
 };