aboutsummaryrefslogtreecommitdiffstats
path: root/src/client/ClientModel.hpp
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.hpp
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.hpp')
-rw-r--r--src/client/ClientModel.hpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/client/ClientModel.hpp b/src/client/ClientModel.hpp
index 07500db..b629a37 100644
--- a/src/client/ClientModel.hpp
+++ b/src/client/ClientModel.hpp
@@ -34,25 +34,25 @@ namespace Client {
class ClientModel
{
public:
- void new_object(SharedPtr<ClientObject> object);
+ void new_object(SPtr<ClientObject> object);
void erase_object(uint64_t id);
void property(uint64_t id, URIInt key, const Raul::Atom& value);
- SharedPtr<ClientObject> find(uint64_t id);
+ SPtr<ClientObject> find(uint64_t id);
- sigc::signal< void, SharedPtr<ClientObject> > signal_new_object;
- sigc::signal< void, SharedPtr<ClientObject> > signal_erase_object;
+ sigc::signal< void, SPtr<ClientObject> > signal_new_object;
+ sigc::signal< void, SPtr<ClientObject> > signal_erase_object;
private:
struct ClientObjectComparator {
- inline bool operator()(SharedPtr<ClientObject> lhs,
- SharedPtr<ClientObject> rhs) const {
+ inline bool operator()(SPtr<ClientObject> lhs,
+ SPtr<ClientObject> rhs) const {
return lhs->id() < rhs->id();
}
};
- typedef std::set<SharedPtr<ClientObject>, ClientObjectComparator> Objects;
+ typedef std::set<SPtr<ClientObject>, ClientObjectComparator> Objects;
Objects _objects;
};