summaryrefslogtreecommitdiffstats
path: root/src/client/GraphModel.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
commitdf1447c665e6c3631961297a9d3e9aff4e94c47f (patch)
treec0ff117c362e6d571f430f886ab62f372b59af08 /src/client/GraphModel.cpp
parentbb335dca695273622b7a4ebbefbe9e089edb9ab4 (diff)
downloadingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.gz
ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.bz2
ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.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/ingen@4939 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/GraphModel.cpp')
-rw-r--r--src/client/GraphModel.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index 98155138..8586f168 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -28,24 +28,24 @@ namespace Ingen {
namespace Client {
void
-GraphModel::add_child(SharedPtr<ObjectModel> c)
+GraphModel::add_child(SPtr<ObjectModel> c)
{
assert(c->parent().get() == this);
- SharedPtr<PortModel> pm = PtrCast<PortModel>(c);
+ SPtr<PortModel> pm = dynamic_ptr_cast<PortModel>(c);
if (pm) {
add_port(pm);
return;
}
- SharedPtr<BlockModel> bm = PtrCast<BlockModel>(c);
+ SPtr<BlockModel> bm = dynamic_ptr_cast<BlockModel>(c);
if (bm) {
_signal_new_block.emit(bm);
}
}
bool
-GraphModel::remove_child(SharedPtr<ObjectModel> o)
+GraphModel::remove_child(SPtr<ObjectModel> o)
{
assert(o->path().is_child_of(path()));
assert(o->parent().get() == this);
@@ -56,7 +56,7 @@ GraphModel::remove_child(SharedPtr<ObjectModel> o)
Arcs::iterator next = j;
++next;
- SharedPtr<ArcModel> arc = PtrCast<ArcModel>(j->second);
+ SPtr<ArcModel> arc = dynamic_ptr_cast<ArcModel>(j->second);
if (arc->tail_path().parent() == o->path()
|| arc->tail_path() == o->path()
|| arc->head_path().parent() == o->path()
@@ -67,11 +67,11 @@ GraphModel::remove_child(SharedPtr<ObjectModel> o)
j = next;
}
- SharedPtr<PortModel> pm = PtrCast<PortModel>(o);
+ SPtr<PortModel> pm = dynamic_ptr_cast<PortModel>(o);
if (pm)
remove_port(pm);
- SharedPtr<BlockModel> bm = PtrCast<BlockModel>(o);
+ SPtr<BlockModel> bm = dynamic_ptr_cast<BlockModel>(o);
if (bm) {
_signal_removed_block.emit(bm);
}
@@ -90,14 +90,14 @@ GraphModel::clear()
assert(_ports.empty());
}
-SharedPtr<ArcModel>
+SPtr<ArcModel>
GraphModel::get_arc(const Node* tail, const Node* head)
{
Arcs::iterator i = _arcs.find(make_pair(tail, head));
if (i != _arcs.end())
- return PtrCast<ArcModel>(i->second);
+ return dynamic_ptr_cast<ArcModel>(i->second);
else
- return SharedPtr<ArcModel>();
+ return SPtr<ArcModel>();
}
/** Add a connection to this graph.
@@ -108,7 +108,7 @@ GraphModel::get_arc(const Node* tail, const Node* head)
* this graph is a fatal error.
*/
void
-GraphModel::add_arc(SharedPtr<ArcModel> arc)
+GraphModel::add_arc(SPtr<ArcModel> arc)
{
// Store should have 'resolved' the connection already
assert(arc);
@@ -122,7 +122,7 @@ GraphModel::add_arc(SharedPtr<ArcModel> arc)
assert(arc->head()->parent().get() == this
|| arc->head()->parent()->parent().get() == this);
- SharedPtr<ArcModel> existing = get_arc(
+ SPtr<ArcModel> existing = get_arc(
arc->tail().get(), arc->head().get());
if (existing) {
@@ -141,7 +141,7 @@ GraphModel::remove_arc(const Node* tail, const Node* head)
{
Arcs::iterator i = _arcs.find(make_pair(tail, head));
if (i != _arcs.end()) {
- SharedPtr<ArcModel> arc = PtrCast<ArcModel>(i->second);
+ SPtr<ArcModel> arc = dynamic_ptr_cast<ArcModel>(i->second);
_signal_removed_arc.emit(arc);
_arcs.erase(i);
}