diff options
| author | David Robillard <d@drobilla.net> | 2007-10-08 16:30:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-10-08 16:30:57 +0000 |
| commit | 763bba9de67fb1bd06658a0bac91440727ee5a51 (patch) | |
| tree | 39e7af069828981c2c06d78e015686062eba73dc /src/libs/client/ObjectModel.hpp | |
| parent | 260a406b12997fdab7446a9980e921d8cfc46915 (diff) | |
| download | ingen-763bba9de67fb1bd06658a0bac91440727ee5a51.tar.gz ingen-763bba9de67fb1bd06658a0bac91440727ee5a51.tar.bz2 ingen-763bba9de67fb1bd06658a0bac91440727ee5a51.zip | |
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
Diffstat (limited to 'src/libs/client/ObjectModel.hpp')
| -rw-r--r-- | src/libs/client/ObjectModel.hpp | 12 |
1 files changed, 5 insertions, 7 deletions
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 <raul/Atom.hpp> #include <raul/Path.hpp> #include <raul/SharedPtr.hpp> -#include <raul/Table.hpp> +#include <raul/PathTable.hpp> #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<ObjectModel> 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<ObjectModel> find_child(const string& name) const; + const_iterator children_begin() const; + const_iterator children_end() const; + SharedPtr<Shared::GraphObject> find_child(const string& name) const; // Signals sigc::signal<void, SharedPtr<ObjectModel> > signal_new_child; |