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/GraphView.hpp | |
| 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/GraphView.hpp')
| -rw-r--r-- | src/gui/GraphView.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp index cae073af..c060d02e 100644 --- a/src/gui/GraphView.hpp +++ b/src/gui/GraphView.hpp @@ -26,7 +26,7 @@ #include <gtkmm/toolitem.h> #include <gtkmm/toolitem.h> -#include "raul/SharedPtr.hpp" +#include "ingen/types.hpp" #include "raul/URI.hpp" namespace Raul { class Atom; } @@ -61,18 +61,18 @@ public: void init(App& app); - SharedPtr<GraphCanvas> canvas() const { return _canvas; } - SharedPtr<const Client::GraphModel> graph() const { return _graph; } - Gtk::ToolItem* breadcrumb_container() const { return _breadcrumb_container; } + SPtr<GraphCanvas> canvas() const { return _canvas; } + SPtr<const Client::GraphModel> graph() const { return _graph; } + Gtk::ToolItem* breadcrumb_container() const { return _breadcrumb_container; } - static SharedPtr<GraphView> create(App& app, - SharedPtr<const Client::GraphModel> graph); + static SPtr<GraphView> create(App& app, + SPtr<const Client::GraphModel> graph); sigc::signal<void, const Client::ObjectModel*> signal_object_entered; sigc::signal<void, const Client::ObjectModel*> signal_object_left; private: - void set_graph(SharedPtr<const Client::GraphModel> graph); + void set_graph(SPtr<const Client::GraphModel> graph); void process_toggled(); void poly_changed(); @@ -90,8 +90,8 @@ private: App* _app; - SharedPtr<const Client::GraphModel> _graph; - SharedPtr<GraphCanvas> _canvas; + SPtr<const Client::GraphModel> _graph; + SPtr<GraphCanvas> _canvas; Gtk::ScrolledWindow* _canvas_scrolledwindow; Gtk::Toolbar* _toolbar; |