diff options
Diffstat (limited to 'src/gui/NodeModule.hpp')
| -rw-r--r-- | src/gui/NodeModule.hpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index d4b845cf..55a255a8 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -17,10 +17,11 @@ #ifndef INGEN_GUI_NODEMODULE_HPP #define INGEN_GUI_NODEMODULE_HPP +#include "Port.hpp" + #include "ganv/Module.hpp" -#include "ingen/memory.hpp" -#include "Port.hpp" +#include <memory> namespace ingen { namespace client { @@ -46,26 +47,26 @@ class NodeMenu; class NodeModule : public Ganv::Module { public: - static NodeModule* create( - GraphCanvas& canvas, - SPtr<const client::BlockModel> block, - bool human); + static NodeModule* create(GraphCanvas& canvas, + std::shared_ptr<const client::BlockModel> block, + bool human); ~NodeModule() override; App& app() const; - Port* port(SPtr<const client::PortModel> model); + Port* port(std::shared_ptr<const client::PortModel> model); - void delete_port_view(SPtr<const client::PortModel> model); + void delete_port_view(std::shared_ptr<const client::PortModel> model); virtual void store_location(double ax, double ay); void show_human_names(bool b); - SPtr<const client::BlockModel> block() const { return _block; } + std::shared_ptr<const client::BlockModel> block() const { return _block; } protected: - NodeModule(GraphCanvas& canvas, SPtr<const client::BlockModel> block); + NodeModule(GraphCanvas& canvas, + std::shared_ptr<const client::BlockModel> block); virtual bool on_double_click(GdkEventButton* ev); @@ -81,7 +82,7 @@ protected: void rename(); void property_changed(const URI& key, const Atom& value); - void new_port_view(SPtr<const client::PortModel> port); + void new_port_view(std::shared_ptr<const client::PortModel> port); void port_activity(uint32_t index, const Atom& value); void port_value_changed(uint32_t index, const Atom& value); @@ -90,12 +91,12 @@ protected: bool show_menu(GdkEventButton* ev); - SPtr<const client::BlockModel> _block; - NodeMenu* _menu; - SPtr<client::PluginUI> _plugin_ui; - Gtk::Widget* _gui_widget; - Gtk::Window* _gui_window; ///< iff popped up - bool _initialised; + std::shared_ptr<const client::BlockModel> _block; + NodeMenu* _menu; + std::shared_ptr<client::PluginUI> _plugin_ui; + Gtk::Widget* _gui_widget; + Gtk::Window* _gui_window; ///< iff popped up + bool _initialised; }; } // namespace gui |