diff options
author | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
commit | df1447c665e6c3631961297a9d3e9aff4e94c47f (patch) | |
tree | c0ff117c362e6d571f430f886ab62f372b59af08 /src/gui/WindowFactory.cpp | |
parent | bb335dca695273622b7a4ebbefbe9e089edb9ab4 (diff) | |
download | ingen-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/gui/WindowFactory.cpp')
-rw-r--r-- | src/gui/WindowFactory.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 983e246b..f8738f40 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -87,7 +87,7 @@ WindowFactory::num_open_graph_windows() } GraphBox* -WindowFactory::graph_box(SharedPtr<const GraphModel> graph) +WindowFactory::graph_box(SPtr<const GraphModel> graph) { GraphWindow* window = graph_window(graph); if (window) { @@ -98,7 +98,7 @@ WindowFactory::graph_box(SharedPtr<const GraphModel> graph) } GraphWindow* -WindowFactory::graph_window(SharedPtr<const GraphModel> graph) +WindowFactory::graph_window(SPtr<const GraphModel> graph) { if (!graph) return NULL; @@ -109,12 +109,12 @@ WindowFactory::graph_window(SharedPtr<const GraphModel> graph) } GraphWindow* -WindowFactory::parent_graph_window(SharedPtr<const BlockModel> block) +WindowFactory::parent_graph_window(SPtr<const BlockModel> block) { if (!block) return NULL; - return graph_window(PtrCast<GraphModel>(block->parent())); + return graph_window(dynamic_ptr_cast<GraphModel>(block->parent())); } /** Present a GraphWindow for a Graph. @@ -124,9 +124,9 @@ WindowFactory::parent_graph_window(SharedPtr<const BlockModel> block) * presented and @a preferred left unmodified. */ void -WindowFactory::present_graph(SharedPtr<const GraphModel> graph, - GraphWindow* preferred, - SharedPtr<GraphView> view) +WindowFactory::present_graph(SPtr<const GraphModel> graph, + GraphWindow* preferred, + SPtr<GraphView> view) { assert(!view || view->graph() == graph); @@ -150,8 +150,8 @@ WindowFactory::present_graph(SharedPtr<const GraphModel> graph, } GraphWindow* -WindowFactory::new_graph_window(SharedPtr<const GraphModel> graph, - SharedPtr<GraphView> view) +WindowFactory::new_graph_window(SPtr<const GraphModel> graph, + SPtr<GraphView> view) { assert(!view || view->graph() == graph); @@ -185,8 +185,8 @@ WindowFactory::remove_graph_window(GraphWindow* win, GdkEventAny* ignored) } void -WindowFactory::present_load_plugin(SharedPtr<const GraphModel> graph, - Node::Properties data) +WindowFactory::present_load_plugin(SPtr<const GraphModel> graph, + Node::Properties data) { _app.request_plugins_if_necessary(); @@ -208,8 +208,8 @@ WindowFactory::present_load_plugin(SharedPtr<const GraphModel> graph, } void -WindowFactory::present_load_graph(SharedPtr<const GraphModel> graph, - Node::Properties data) +WindowFactory::present_load_graph(SPtr<const GraphModel> graph, + Node::Properties data) { GraphWindowMap::iterator w = _graph_windows.find(graph->path()); @@ -220,8 +220,8 @@ WindowFactory::present_load_graph(SharedPtr<const GraphModel> graph, } void -WindowFactory::present_load_subgraph(SharedPtr<const GraphModel> graph, - Node::Properties data) +WindowFactory::present_load_subgraph(SPtr<const GraphModel> graph, + Node::Properties data) { GraphWindowMap::iterator w = _graph_windows.find(graph->path()); @@ -232,8 +232,8 @@ WindowFactory::present_load_subgraph(SharedPtr<const GraphModel> graph, } void -WindowFactory::present_new_subgraph(SharedPtr<const GraphModel> graph, - Node::Properties data) +WindowFactory::present_new_subgraph(SPtr<const GraphModel> graph, + Node::Properties data) { GraphWindowMap::iterator w = _graph_windows.find(graph->path()); @@ -244,7 +244,7 @@ WindowFactory::present_new_subgraph(SharedPtr<const GraphModel> graph, } void -WindowFactory::present_rename(SharedPtr<const ObjectModel> object) +WindowFactory::present_rename(SPtr<const ObjectModel> object) { GraphWindowMap::iterator w = _graph_windows.find(object->path()); if (w == _graph_windows.end()) @@ -257,7 +257,7 @@ WindowFactory::present_rename(SharedPtr<const ObjectModel> object) } void -WindowFactory::present_properties(SharedPtr<const ObjectModel> object) +WindowFactory::present_properties(SPtr<const ObjectModel> object) { GraphWindowMap::iterator w = _graph_windows.find(object->path()); if (w == _graph_windows.end()) |