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/NodeModule.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/NodeModule.hpp')
| -rw-r--r-- | src/gui/NodeModule.hpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 3dc7e93e..f1521c5f 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -18,7 +18,7 @@ #define INGEN_GUI_NODEMODULE_HPP #include "ganv/Module.hpp" -#include "raul/SharedPtr.hpp" +#include "ingen/types.hpp" #include "Port.hpp" @@ -47,25 +47,25 @@ class NodeModule : public Ganv::Module { public: static NodeModule* create( - GraphCanvas& canvas, - SharedPtr<const Client::BlockModel> block, - bool human_names); + GraphCanvas& canvas, + SPtr<const Client::BlockModel> block, + bool human_names); virtual ~NodeModule(); App& app() const; - Port* port(boost::shared_ptr<const Client::PortModel> model); + Port* port(SPtr<const Client::PortModel> model); - void delete_port_view(SharedPtr<const Client::PortModel> port); + void delete_port_view(SPtr<const Client::PortModel> port); virtual void store_location(double x, double y); void show_human_names(bool b); - SharedPtr<const Client::BlockModel> block() const { return _block; } + SPtr<const Client::BlockModel> block() const { return _block; } protected: - NodeModule(GraphCanvas& canvas, SharedPtr<const Client::BlockModel> block); + NodeModule(GraphCanvas& canvas, SPtr<const Client::BlockModel> block); virtual bool on_double_click(GdkEventButton* ev); @@ -80,7 +80,7 @@ protected: void rename(); void property_changed(const Raul::URI& predicate, const Raul::Atom& value); - void new_port_view(SharedPtr<const Client::PortModel> port); + void new_port_view(SPtr<const Client::PortModel> port); void value_changed(uint32_t index, const Raul::Atom& value); void port_activity(uint32_t index, const Raul::Atom& value); @@ -89,11 +89,11 @@ protected: bool show_menu(GdkEventButton* ev); - SharedPtr<const Client::BlockModel> _block; - NodeMenu* _menu; - SharedPtr<Client::PluginUI> _plugin_ui; - Gtk::Widget* _gui_widget; - Gtk::Window* _gui_window; ///< iff popped up + SPtr<const Client::BlockModel> _block; + NodeMenu* _menu; + SPtr<Client::PluginUI> _plugin_ui; + Gtk::Widget* _gui_widget; + Gtk::Window* _gui_window; ///< iff popped up }; } // namespace GUI |