From e9b0dd4e63141e79350b675ae5c64d787e3f8856 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 1 Jan 2008 19:52:36 +0000
Subject: RAUL code cleanup.

git-svn-id: http://svn.drobilla.net/lad/ingen@999 a436a847-0d15-0410-975c-d299462d15a1
---
 src/common/interface/GraphObject.hpp  |  2 +-
 src/libs/engine/GraphObjectImpl.hpp   | 18 +++++++++---------
 src/libs/engine/OutputPort.hpp        | 12 ++++++------
 src/libs/serialisation/Serialiser.hpp | 21 +++++++++++----------
 4 files changed, 27 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/common/interface/GraphObject.hpp b/src/common/interface/GraphObject.hpp
index bed058f0..0f6ff9cb 100644
--- a/src/common/interface/GraphObject.hpp
+++ b/src/common/interface/GraphObject.hpp
@@ -55,7 +55,7 @@ public:
 	
 	virtual const_iterator         children_begin() const = 0;
 	virtual const_iterator         children_end() const = 0;
-	virtual SharedPtr<GraphObject> find_child(const string& name) const = 0;
+	virtual SharedPtr<GraphObject> find_child(const std::string& name) const = 0;
 };
 
 
diff --git a/src/libs/engine/GraphObjectImpl.hpp b/src/libs/engine/GraphObjectImpl.hpp
index 8563035b..c48ad049 100644
--- a/src/libs/engine/GraphObjectImpl.hpp
+++ b/src/libs/engine/GraphObjectImpl.hpp
@@ -58,7 +58,7 @@ public:
 	GraphObject* graph_parent() const { return _parent; }
 	
 	inline GraphObjectImpl* parent() const { return _parent; }
-	const string name()   const { return _name; }
+	const std::string       name()   const { return _name; }
 	
 	virtual void process(ProcessContext& context) = 0;
 
@@ -69,10 +69,10 @@ public:
 		assert(_name.find("/") == string::npos);
 	}
 	
-	void set_variable(const string& key, const Atom& value)
+	void set_variable(const std::string& key, const Atom& value)
 		{ _variables[key] = value; }
 
-	const Atom& get_variable(const string& key) {
+	const Atom& get_variable(const std::string& key) {
 		static Atom null_atom;
 		Variables::iterator i = _variables.find(key);
 		return (i != _variables.end()) ? (*i).second : null_atom;
@@ -86,24 +86,24 @@ public:
 	/** Path is dynamically generated from parent to ease renaming */
 	const Path path() const {
 		if (_parent == NULL)
-			return Path(string("/").append(_name));
+			return Path(std::string("/").append(_name));
 		else if (_parent->path() == "/")
-			return Path(string("/").append(_name));
+			return Path(std::string("/").append(_name));
 		else
 			return Path(_parent->path() +"/"+ _name);
 	}
 	
 	const_iterator         children_begin() const;
 	const_iterator         children_end() const;
-	SharedPtr<GraphObject> find_child(const string& name) const;
+	SharedPtr<GraphObject> find_child(const std::string& name) const;
 
 protected:
-	GraphObjectImpl(GraphObjectImpl* parent, const string& name, bool polyphonic=false)
+	GraphObjectImpl(GraphObjectImpl* parent, const std::string& name, bool polyphonic=false)
 		: _parent(parent), _name(name), _polyphonic(polyphonic)
 	{
 		assert(parent == NULL || _name.length() > 0);
-		assert(_name.find("/") == string::npos);
-		assert(path().find("//") == string::npos);
+		assert(_name.find("/") == std::string::npos);
+		assert(path().find("//") == std::string::npos);
 	}
 	
 	GraphObjectImpl* _parent;
diff --git a/src/libs/engine/OutputPort.hpp b/src/libs/engine/OutputPort.hpp
index e744b9e6..a184c32b 100644
--- a/src/libs/engine/OutputPort.hpp
+++ b/src/libs/engine/OutputPort.hpp
@@ -40,12 +40,12 @@ namespace Ingen {
 class OutputPort : virtual public PortImpl
 {
 public:
-	OutputPort(NodeImpl*     parent,
-	           const string& name,
-	           uint32_t      index,
-	           uint32_t      poly,
-	           DataType      type,
-	           size_t        buffer_size);
+	OutputPort(NodeImpl*          parent,
+	           const std::string& name,
+	           uint32_t           index,
+	           uint32_t           poly,
+	           DataType           type,
+	           size_t             buffer_size);
 
 	void pre_process(ProcessContext& context);
 	void post_process(ProcessContext& context);
diff --git a/src/libs/serialisation/Serialiser.hpp b/src/libs/serialisation/Serialiser.hpp
index e14560b7..26439bdf 100644
--- a/src/libs/serialisation/Serialiser.hpp
+++ b/src/libs/serialisation/Serialiser.hpp
@@ -56,21 +56,22 @@ class Serialiser
 public:
 	Serialiser(Redland::World& world);
 
-	void   to_file(SharedPtr<GraphObject> object, const string& filename);
+	void   to_file(SharedPtr<GraphObject> object, const std::string& filename);
 
-	string to_string(SharedPtr<GraphObject>        object,
-	                 const string&                 base_uri,
-	                 const GraphObject::Variables& extra_rdf);
+	std::string to_string(SharedPtr<GraphObject>        object,
+	                      const std::string&            base_uri,
+	                      const GraphObject::Variables& extra_rdf);
 	
-	void   start_to_string(const string& base_uri);
-	void   serialise(SharedPtr<GraphObject> object) throw (std::logic_error);
-	void   serialise_connection(SharedPtr<Shared::Connection> c) throw (std::logic_error);
-	string finish();
+	void start_to_string(const std::string& base_uri);
+	void serialise(SharedPtr<GraphObject> object) throw (std::logic_error);
+	void serialise_connection(SharedPtr<Shared::Connection> c) throw (std::logic_error);
+	
+	std::string finish();
 	
 private:
 	enum Mode { TO_FILE, TO_STRING };
 	
-	void start_to_filename(const string& filename);
+	void start_to_filename(const std::string& filename);
 
 	void setup_prefixes();
 
@@ -90,7 +91,7 @@ private:
 	SharedPtr<GraphObject> _root_object;
 	Mode                   _mode;
 	NodeMap                _node_map;
-	string                 _base_uri;
+	std::string            _base_uri;
 	Redland::World&        _world;
 	Redland::Model*        _model;
 };
-- 
cgit v1.2.1