diff options
Diffstat (limited to 'src/libs/client/ObjectModel.h')
| -rw-r--r-- | src/libs/client/ObjectModel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.h index 94103c53..b9a6d75d 100644 --- a/src/libs/client/ObjectModel.h +++ b/src/libs/client/ObjectModel.h @@ -25,7 +25,7 @@ #include <cassert> #include <sigc++/sigc++.h> #include "util/Path.h" - +#include "util/CountedPtr.h" using std::string; using std::map; using std::find; using std::cout; using std::cerr; using std::endl; using Om::Path; @@ -55,8 +55,8 @@ public: inline const Path& path() const { return m_path; } virtual void set_path(const Path& p) { m_path = p; } - ObjectModel* parent() const { return m_parent; } - virtual void set_parent(ObjectModel* p) { m_parent = p; } + CountedPtr<ObjectModel> parent() const { return m_parent; } + virtual void set_parent(CountedPtr<ObjectModel> p) { m_parent = p; } ObjectController* controller() const { return m_controller; } @@ -69,9 +69,9 @@ public: // Signals sigc::signal<void, const string&, const string&> metadata_update_sig; protected: - Path m_path; - ObjectModel* m_parent; - ObjectController* m_controller; + Path m_path; + CountedPtr<ObjectModel> m_parent; + ObjectController* m_controller; // FIXME: remove map<string,string> m_metadata; |