From 763bba9de67fb1bd06658a0bac91440727ee5a51 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 8 Oct 2007 16:30:57 +0000 Subject: SharedPtr-ify engine side store. Fix reattaching to engine. Fix connection paths. Remove last dependencies on client (model) library from Serialiser. Fix Raul::PathTable::find_descendants_end. git-svn-id: http://svn.drobilla.net/lad/ingen@847 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/ObjectModel.hpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/libs/client/ObjectModel.hpp') diff --git a/src/libs/client/ObjectModel.hpp b/src/libs/client/ObjectModel.hpp index ede796e4..3c13b227 100644 --- a/src/libs/client/ObjectModel.hpp +++ b/src/libs/client/ObjectModel.hpp @@ -28,10 +28,11 @@ #include #include #include -#include +#include #include "interface/GraphObject.hpp" #include "Store.hpp" +using Raul::PathTable; using std::string; using Raul::Atom; using Raul::Path; @@ -68,12 +69,9 @@ public: SharedPtr parent() const { return _parent; } bool polyphonic() const { return _polyphonic; } - typedef Store::Objects::iterator iterator; - typedef Store::Objects::const_iterator const_iterator; - - const_iterator children_begin() const; - const_iterator children_end() const; - SharedPtr find_child(const string& name) const; + const_iterator children_begin() const; + const_iterator children_end() const; + SharedPtr find_child(const string& name) const; // Signals sigc::signal > signal_new_child; -- cgit v1.2.1