Moved generic utility stuff to new library "raul".

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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/libs/client/ConnectionModel.h b/src/libs/client/ConnectionModel.h
index e1530f88..6dc85405 100644
--- a/src/libs/client/ConnectionModel.h
+++ b/src/libs/client/ConnectionModel.h
@@ -18,8 +18,8 @@
 #define CONNECTIONMODEL_H
 
 #include <string>
-#include "util/Path.h"
-#include "util/CountedPtr.h"
+#include "raul/Path.h"
+#include "raul/SharedPtr.h"
 #include "PortModel.h"
 #include <cassert>
 using std::string;
@@ -43,8 +43,8 @@ class Store;
 class ConnectionModel
 {
 public:
-	CountedPtr<PortModel> src_port() const { return _src_port; }
-	CountedPtr<PortModel> dst_port() const { return _dst_port; }
+	SharedPtr<PortModel> src_port() const { return _src_port; }
+	SharedPtr<PortModel> dst_port() const { return _dst_port; }
 
 	const Path& src_port_path() const;
 	const Path& dst_port_path() const;
@@ -54,21 +54,21 @@ private:
 	friend class Store;
 
 	ConnectionModel(const Path& src_port, const Path& dst_port);
-	ConnectionModel(CountedPtr<PortModel> src, CountedPtr<PortModel> dst);
+	ConnectionModel(SharedPtr<PortModel> src, SharedPtr<PortModel> dst);
 	
-	void set_src_port(CountedPtr<PortModel> port) { _src_port = port; _src_port_path = port->path(); }
-	void set_dst_port(CountedPtr<PortModel> port) { _dst_port = port; _dst_port_path = port->path(); }
+	void set_src_port(SharedPtr<PortModel> port) { _src_port = port; _src_port_path = port->path(); }
+	void set_dst_port(SharedPtr<PortModel> port) { _dst_port = port; _dst_port_path = port->path(); }
 
 	void src_port_path(const string& s) { _src_port_path = s; }
 	void dst_port_path(const string& s) { _dst_port_path = s; }
 
 	Path                  _src_port_path; ///< Only used if _src_port == NULL
 	Path                  _dst_port_path; ///< Only used if _dst_port == NULL
-	CountedPtr<PortModel> _src_port;
-	CountedPtr<PortModel> _dst_port;
+	SharedPtr<PortModel> _src_port;
+	SharedPtr<PortModel> _dst_port;
 };
 
-typedef list<CountedPtr<ConnectionModel> > ConnectionList;
+typedef list<SharedPtr<ConnectionModel> > ConnectionList;
 
 
 } // namespace Client