diff options
author | David Robillard <d@drobilla.net> | 2012-07-30 23:22:44 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-07-30 23:22:44 +0000 |
commit | 9088edb2534a616b757197662d77abcb0291470b (patch) | |
tree | fc3c86d6a7af39642768d4b864dd38438f9a2e48 /src/client/ObjectModel.cpp | |
parent | 0e1bf6ddfc77866ff6477a3f394c030c2a5e1b39 (diff) | |
download | ingen-9088edb2534a616b757197662d77abcb0291470b.tar.gz ingen-9088edb2534a616b757197662d77abcb0291470b.tar.bz2 ingen-9088edb2534a616b757197662d77abcb0291470b.zip |
Merge Resource and ResourceImpl, eliminating more virtual inheritance.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4577 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/ObjectModel.cpp')
-rw-r--r-- | src/client/ObjectModel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index e7e7a5d8..9a5009ba 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -23,14 +23,14 @@ namespace Ingen { namespace Client { ObjectModel::ObjectModel(Shared::URIs& uris, const Raul::Path& path) - : ResourceImpl(uris, path) + : GraphObject(uris, path) , _path(path) , _symbol((path == Raul::Path::root()) ? "root" : path.symbol()) { } ObjectModel::ObjectModel(const ObjectModel& copy) - : ResourceImpl(copy) + : GraphObject(copy) , _parent(copy._parent) , _path(copy._path) , _symbol(copy._symbol) @@ -82,7 +82,7 @@ ObjectModel::set(SharedPtr<ObjectModel> o) for (Properties::const_iterator v = o->properties().begin(); v != o->properties().end(); ++v) { - ResourceImpl::set_property(v->first, v->second); + Resource::set_property(v->first, v->second); _signal_property.emit(v->first, v->second); } } |