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/BreadCrumbs.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/BreadCrumbs.hpp')
-rw-r--r-- | src/gui/BreadCrumbs.hpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp index cdb11583..933a28dc 100644 --- a/src/gui/BreadCrumbs.hpp +++ b/src/gui/BreadCrumbs.hpp @@ -24,9 +24,9 @@ #include <gtkmm/togglebutton.h> #include "raul/Path.hpp" -#include "raul/SharedPtr.hpp" #include "ingen/client/GraphModel.hpp" +#include "ingen/types.hpp" #include "GraphView.hpp" @@ -43,11 +43,11 @@ class BreadCrumbs : public Gtk::HBox public: explicit BreadCrumbs(App& app); - SharedPtr<GraphView> view(const Raul::Path& path); + SPtr<GraphView> view(const Raul::Path& path); - void build(Raul::Path path, SharedPtr<GraphView> view); + void build(Raul::Path path, SPtr<GraphView> view); - sigc::signal<void, const Raul::Path&, SharedPtr<GraphView> > signal_graph_selected; + sigc::signal<void, const Raul::Path&, SPtr<GraphView> > signal_graph_selected; private: /** Breadcrumb button. @@ -62,7 +62,7 @@ private: class BreadCrumb : public Gtk::ToggleButton { public: - BreadCrumb(const Raul::Path& path, SharedPtr<GraphView> view = SharedPtr<GraphView>()) + BreadCrumb(const Raul::Path& path, SPtr<GraphView> view = SPtr<GraphView>()) : _path(path) , _view(view) { @@ -73,13 +73,13 @@ private: show_all(); } - void set_view(SharedPtr<GraphView> view) { + void set_view(SPtr<GraphView> view) { assert(!view || view->graph()->path() == _path); _view = view; } - const Raul::Path& path() const { return _path; } - SharedPtr<GraphView> view() const { return _view; } + const Raul::Path& path() const { return _path; } + SPtr<GraphView> view() const { return _view; } void set_path(const Raul::Path& path) { remove(); @@ -94,12 +94,12 @@ private: } private: - Raul::Path _path; - SharedPtr<GraphView> _view; + Raul::Path _path; + SPtr<GraphView> _view; }; - BreadCrumb* create_crumb(const Raul::Path& path, - SharedPtr<GraphView> view = SharedPtr<GraphView>()); + BreadCrumb* create_crumb(const Raul::Path& path, + SPtr<GraphView> view = SPtr<GraphView>()); void breadcrumb_clicked(BreadCrumb* crumb); |