Remove 'using' declarations from headers.

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

3 files changed, 13 insertions, 12 deletions

diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index 78e0ef7c..bafcae9f 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -30,6 +30,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
+using namespace Serialisation;
 namespace Client {
 
 
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index 60b458ac..c0f979f4 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -68,10 +68,10 @@ private:
 	Glib::Mutex _mutex;
 	SharedPtr<Shared::ClientInterface> _target;
 
-	Shared::World*    _world;
-	const std::string _url;
-	SoupSession*      _session;
-	SharedPtr<Parser> _parser;
+	Shared::World*                   _world;
+	const std::string                _url;
+	SoupSession*                     _session;
+	SharedPtr<Serialisation::Parser> _parser;
 };
 
 
diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp
index 23fce480..90b11ae0 100644
--- a/src/client/PortModel.hpp
+++ b/src/client/PortModel.hpp
@@ -42,7 +42,7 @@ public:
 	enum Direction { INPUT, OUTPUT };
 	
 	inline uint32_t          index()     const { return _index; } 
-	inline DataType          type()      const { return _type; }
+	inline Shared::DataType  type()      const { return _type; }
 	inline const Raul::Atom& value()     const { return _current_val; }
 	inline bool              connected() const { return (_connections > 0); }
 	inline bool              is_input()  const { return (_direction == INPUT); }
@@ -78,7 +78,7 @@ public:
 private:
 	friend class ClientStore;
 	
-	PortModel(const Raul::Path& path, uint32_t index, DataType type, Direction dir)
+	PortModel(const Raul::Path& path, uint32_t index, Shared::DataType type, Direction dir)
 		: ObjectModel(path)
 		, _index(index)
 		, _type(type)
@@ -86,7 +86,7 @@ private:
 		, _current_val(0.0f)
 		, _connections(0)
 	{
-		if (_type == DataType::UNKNOWN)
+		if (_type == Shared::DataType::UNKNOWN)
 			std::cerr << "[PortModel] Warning: Unknown port type" << std::endl;
 	}
 	
@@ -98,11 +98,11 @@ private:
 	
 	void set(SharedPtr<ObjectModel> model);
 	
-	uint32_t   _index;
-	DataType   _type;
-	Direction  _direction;
-	Raul::Atom _current_val;
-	size_t     _connections;
+	uint32_t         _index;
+	Shared::DataType _type;
+	Direction        _direction;
+	Raul::Atom       _current_val;
+	size_t           _connections;
 };