summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-09-23 19:06:25 +0200
committerDavid Robillard <d@drobilla.net>2018-09-23 19:06:25 +0200
commit04b4d70f38402b1e4e4751157f42eb558bd60f9c (patch)
tree7046ce56d1fb498f5e8720c5fb59ae9895fecb39 /src/gui
parent394b01da8e26dbe1b6a0520944d954ca0b16b1b5 (diff)
downloadingen-04b4d70f38402b1e4e4751157f42eb558bd60f9c.tar.gz
ingen-04b4d70f38402b1e4e4751157f42eb558bd60f9c.tar.bz2
ingen-04b4d70f38402b1e4e4751157f42eb558bd60f9c.zip
Use override specifiers
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/ConnectWindow.hpp4
-rw-r--r--src/gui/GraphCanvas.hpp2
-rw-r--r--src/gui/GraphPortModule.hpp2
-rw-r--r--src/gui/GraphTreeWindow.hpp2
-rw-r--r--src/gui/GraphWindow.hpp8
-rw-r--r--src/gui/LoadGraphWindow.hpp2
-rw-r--r--src/gui/LoadPluginWindow.hpp4
-rw-r--r--src/gui/MessagesWindow.hpp2
-rw-r--r--src/gui/NodeMenu.hpp2
-rw-r--r--src/gui/NodeModule.hpp4
-rw-r--r--src/gui/Port.hpp4
-rw-r--r--src/gui/PortMenu.hpp2
-rw-r--r--src/gui/PropertiesWindow.hpp2
-rw-r--r--src/gui/SubgraphModule.hpp4
-rw-r--r--src/gui/Window.hpp4
-rw-r--r--src/gui/ingen_gui.cpp4
-rw-r--r--src/gui/ingen_gui_lv2.cpp2
17 files changed, 27 insertions, 27 deletions
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index a6874dfc..151b8e92 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -75,8 +75,8 @@ private:
void activate();
void deactivate();
void quit_clicked();
- void on_show();
- void on_hide();
+ void on_show() override;
+ void on_hide() override;
void load_widgets();
void set_connecting_widget_states();
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 86e47faa..509b0a4a 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -73,7 +73,7 @@ public:
void get_new_module_location(double& x, double& y);
- void clear_selection();
+ void clear_selection() override;
void destroy_selection();
void copy_selection();
void paste();
diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp
index 2e060eae..548b7267 100644
--- a/src/gui/GraphPortModule.hpp
+++ b/src/gui/GraphPortModule.hpp
@@ -63,7 +63,7 @@ protected:
SPtr<const client::PortModel> model);
bool show_menu(GdkEventButton* ev);
- void set_selected(gboolean b);
+ void set_selected(gboolean b) override;
void set_port(Port* port) { _port = port; }
diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp
index 3991671d..9ab05f94 100644
--- a/src/gui/GraphTreeWindow.hpp
+++ b/src/gui/GraphTreeWindow.hpp
@@ -103,7 +103,7 @@ public:
void set_window(GraphTreeWindow* win) { _window = win; }
- bool on_button_press_event(GdkEventButton* ev) {
+ bool on_button_press_event(GdkEventButton* ev) override {
bool ret = Gtk::TreeView::on_button_press_event(ev);
if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 3))
diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp
index 69b8a3d4..bdcda312 100644
--- a/src/gui/GraphWindow.hpp
+++ b/src/gui/GraphWindow.hpp
@@ -46,7 +46,7 @@ public:
~GraphWindow();
- void init_window(App& app);
+ void init_window(App& app) override;
SPtr<const client::GraphModel> graph() const { return _box->graph(); }
GraphBox* box() const { return _box; }
@@ -63,9 +63,9 @@ public:
}
protected:
- void on_hide();
- void on_show();
- bool on_key_press_event(GdkEventKey* event);
+ void on_hide() override;
+ void on_show() override;
+ bool on_key_press_event(GdkEventKey* event) override;
private:
GraphBox* _box;
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index d4b36a26..03cb8c05 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -55,7 +55,7 @@ public:
Properties data);
protected:
- void on_show();
+ void on_show() override;
private:
void merge_ports_selected();
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index dcea9d6b..0e6226c9 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -63,8 +63,8 @@ public:
Properties data);
protected:
- void on_show();
- bool on_key_press_event(GdkEventKey* event);
+ void on_show() override;
+ bool on_key_press_event(GdkEventKey* event) override;
private:
/** Columns for the plugin list */
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index b3c5114d..fae6c2c3 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -44,7 +44,7 @@ public:
MessagesWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void init_window(App& app);
+ void init_window(App& app) override;
int log(LV2_URID type, const char* fmt, va_list args);
void flush();
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index e92e48fc..fd4962a9 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -54,7 +54,7 @@ protected:
void add_preset(const URI& uri, const std::string& label);
- void on_menu_disconnect();
+ void on_menu_disconnect() override;
void on_menu_embed_gui();
void on_menu_enabled();
void on_menu_randomize();
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 51692451..ed5914de 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -70,13 +70,13 @@ protected:
virtual bool on_double_click(GdkEventButton* ev);
bool idle_init();
- bool on_event(GdkEvent* ev);
+ bool on_event(GdkEvent* ev) override;
void on_embed_gui_toggled(bool embed);
void embed_gui(bool embed);
bool popup_gui();
void on_gui_window_close();
- bool on_selected(gboolean selected);
+ bool on_selected(gboolean selected) override;
void rename();
void property_changed(const URI& key, const Atom& value);
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index d459f7b3..d88f3f9d 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -64,7 +64,7 @@ public:
void value_changed(const Atom& value);
void activity(const Atom& value);
- bool on_selected(gboolean b);
+ bool on_selected(gboolean b) override;
private:
Port(App& app,
@@ -86,7 +86,7 @@ private:
void on_value_changed(double value);
void on_scale_point_activated(float f);
void on_uri_activated(const URI& uri);
- bool on_event(GdkEvent* ev);
+ bool on_event(GdkEvent* ev) override;
void port_properties_changed();
void set_type_tag();
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index 3de51fae..60084223 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -44,7 +44,7 @@ public:
bool internal_graph_port = false);
private:
- void on_menu_disconnect();
+ void on_menu_disconnect() override;
void on_menu_set_min();
void on_menu_set_max();
void on_menu_reset_range();
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index 0cbd8b91..c1c3eee4 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -93,7 +93,7 @@ private:
Atom get_value(LV2_URID type, Gtk::Widget* value_widget);
void reset();
- void on_show();
+ void on_show() override;
std::string active_key() const;
diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp
index 44241638..6f4e1c4c 100644
--- a/src/gui/SubgraphModule.hpp
+++ b/src/gui/SubgraphModule.hpp
@@ -45,9 +45,9 @@ public:
virtual ~SubgraphModule() {}
- bool on_double_click(GdkEventButton* event);
+ bool on_double_click(GdkEventButton* event) override;
- void store_location(double ax, double ay);
+ void store_location(double ax, double ay) override;
void browse_to_graph();
void menu_remove();
diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp
index 6bf5e586..5f839578 100644
--- a/src/gui/Window.hpp
+++ b/src/gui/Window.hpp
@@ -37,7 +37,7 @@ public:
virtual void init_window(App& app) { _app = &app; }
- bool on_key_press_event(GdkEventKey* event) {
+ bool on_key_press_event(GdkEventKey* event) override {
if (event->keyval == GDK_w && event->state & GDK_CONTROL_MASK) {
hide();
return true;
@@ -61,7 +61,7 @@ public:
virtual void init_dialog(App& app) { _app = &app; }
- bool on_key_press_event(GdkEventKey* event) {
+ bool on_key_press_event(GdkEventKey* event) override {
if (event->keyval == GDK_w && event->state & GDK_CONTROL_MASK) {
hide();
return true;
diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp
index cf1fb88f..441993f7 100644
--- a/src/gui/ingen_gui.cpp
+++ b/src/gui/ingen_gui.cpp
@@ -27,7 +27,7 @@ namespace gui {
struct GUIModule : public Module {
using SigClientInterface = client::SigClientInterface;
- void load(World* world) {
+ void load(World* world) override {
URI uri(world->conf().option("connect").ptr<char>());
if (!world->interface()) {
world->set_interface(
@@ -40,7 +40,7 @@ struct GUIModule : public Module {
app = gui::App::create(world);
}
- void run(World* world) {
+ void run(World* world) override {
app->run();
}
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 56e07b44..251c75e1 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -43,7 +43,7 @@ struct IngenLV2AtomSink : public AtomSink {
, _ui_controller(ui_controller)
{}
- bool write(const LV2_Atom* atom, int32_t default_id) {
+ bool write(const LV2_Atom* atom, int32_t default_id) override {
_ui_write(_ui_controller,
0,
lv2_atom_total_size(atom),