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.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/libs/client/ObjectModel.cpp') diff --git a/src/libs/client/ObjectModel.cpp b/src/libs/client/ObjectModel.cpp index ca38b42f..7d144faf 100644 --- a/src/libs/client/ObjectModel.cpp +++ b/src/libs/client/ObjectModel.cpp @@ -15,9 +15,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ObjectModel.hpp" -#include #include +#include +#include "interface/GraphObject.hpp" +#include "ObjectModel.hpp" using namespace std; @@ -57,7 +58,7 @@ ObjectModel::children_end() const } -SharedPtr +SharedPtr ObjectModel::find_child(const string& name) const { const_iterator me = _store.objects().find(_path); @@ -65,7 +66,7 @@ ObjectModel::find_child(const string& name) const const_iterator children_end = _store.objects().find_descendants_end(me); const_iterator child = _store.objects().find(me, children_end, _path.base() + name); if (child != _store.objects().end()) - return child->second; + return PtrCast(child->second); else return SharedPtr(); } -- cgit v1.2.1