From 30cb85c307b4c1273791721a782337742ade222c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 4 Oct 2006 21:45:20 +0000 Subject: Moved generic utility stuff to new library "raul". git-svn-id: http://svn.drobilla.net/lad/ingen@156 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/ObjectModel.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/libs/client/ObjectModel.h') diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.h index bc780cba..8b6b72ba 100644 --- a/src/libs/client/ObjectModel.h +++ b/src/libs/client/ObjectModel.h @@ -24,9 +24,9 @@ #include #include #include -#include "util/Atom.h" -#include "util/Path.h" -#include "util/CountedPtr.h" +#include "raul/Atom.h" +#include "raul/Path.h" +#include "raul/SharedPtr.h" using std::string; using std::map; using std::find; using std::cout; using std::cerr; using std::endl; @@ -56,7 +56,7 @@ public: const MetadataMap& metadata() const { return _metadata; } inline const Path& path() const { return _path; } - CountedPtr parent() const { return _parent; } + SharedPtr parent() const { return _parent; } // Signals sigc::signal metadata_update_sig; @@ -68,20 +68,20 @@ protected: ObjectModel(const Path& path); virtual void set_path(const Path& p) { _path = p; } - virtual void set_parent(CountedPtr p) { assert(p); _parent = p; } - virtual void add_child(CountedPtr c) = 0; - virtual void remove_child(CountedPtr c) = 0; + virtual void set_parent(SharedPtr p) { assert(p); _parent = p; } + virtual void add_child(SharedPtr c) = 0; + virtual void remove_child(SharedPtr c) = 0; void add_metadata(const MetadataMap& data); - void set(CountedPtr model); + void set(SharedPtr model); void set_metadata(const string& key, const Atom& value) { _metadata[key] = value; metadata_update_sig.emit(key, value); } Path _path; - CountedPtr _parent; + SharedPtr _parent; MetadataMap _metadata; -- cgit v1.2.1