aboutsummaryrefslogtreecommitdiffstats
path: root/src/client/ClientModel.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-12 23:38:03 +0000
committerDavid Robillard <d@drobilla.net>2013-01-12 23:38:03 +0000
commit1dad5b5aaa139993fe19e266d08dfc55844e6804 (patch)
treefd2bed5971853b429f1b74369a778a4d608e6925 /src/client/ClientModel.cpp
parent8f048287d06afd7d3c2e90f4a503d7666a9cb6fa (diff)
downloadmachina-1dad5b5aaa139993fe19e266d08dfc55844e6804.tar.gz
machina-1dad5b5aaa139993fe19e266d08dfc55844e6804.tar.bz2
machina-1dad5b5aaa139993fe19e266d08dfc55844e6804.zip
Remove Raul::SharedPtr and switch to std::shared_ptr.
Use project local short type aliases for shared_ptr and friends. Move Raul::Disposable and Raul::Manageable into Raul::Maid. Use sets to store machina nodes and edges to avoid O(n) searches. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4939 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/ClientModel.cpp')
-rw-r--r--src/client/ClientModel.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/client/ClientModel.cpp b/src/client/ClientModel.cpp
index c945de7..1cc4d3e 100644
--- a/src/client/ClientModel.cpp
+++ b/src/client/ClientModel.cpp
@@ -20,20 +20,20 @@
namespace Machina {
namespace Client {
-SharedPtr<ClientObject>
+SPtr<ClientObject>
ClientModel::find(uint64_t id)
{
- SharedPtr<ClientObject> key(new ClientObjectKey(id));
- Objects::iterator i = _objects.find(key);
+ SPtr<ClientObject> key(new ClientObjectKey(id));
+ Objects::iterator i = _objects.find(key);
if (i != _objects.end()) {
return *i;
} else {
- return SharedPtr<ClientObject>();
+ return SPtr<ClientObject>();
}
}
void
-ClientModel::new_object(SharedPtr<ClientObject> object)
+ClientModel::new_object(SPtr<ClientObject> object)
{
_objects.insert(object);
signal_new_object.emit(object);
@@ -42,21 +42,21 @@ ClientModel::new_object(SharedPtr<ClientObject> object)
void
ClientModel::erase_object(uint64_t id)
{
- SharedPtr<ClientObject> key(new ClientObjectKey(id));
- Objects::iterator i = _objects.find(key);
+ SPtr<ClientObject> key(new ClientObjectKey(id));
+ Objects::iterator i = _objects.find(key);
if (i == _objects.end()) {
return;
}
signal_erase_object.emit(*i);
- (*i)->set_view(SharedPtr<ClientObject::View>());
+ (*i)->set_view(SPtr<ClientObject::View>());
_objects.erase(i);
}
void
ClientModel::property(uint64_t id, URIInt key, const Raul::Atom& value)
{
- SharedPtr<ClientObject> object = find(id);
+ SPtr<ClientObject> object = find(id);
if (object) {
object->set(key, value);
}