From 5d588ee9d7fb7da1c3ef6fef2fe30804d23bb857 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 27 Nov 2020 17:58:08 +0100 Subject: Use "override" --- .clang-tidy | 2 -- src/AlsaDriver.hpp | 22 ++++++++++++---------- src/JackDbusDriver.hpp | 22 ++++++++++++---------- src/JackDriver.hpp | 23 +++++++++++++---------- src/PatchageCanvas.hpp | 2 +- src/PatchageModule.hpp | 4 ++-- src/PatchagePort.hpp | 4 ++-- src/warnings.hpp | 11 +++++++---- wscript | 5 ----- 9 files changed, 49 insertions(+), 46 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 2207251..694942a 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -9,7 +9,6 @@ Checks: > -*-special-member-functions, -*-unused-macros, -*-uppercase-literal-suffix, - -*-use-override, -*-vararg, -bugprone-branch-clone, -bugprone-forward-declaration-namespace, @@ -17,7 +16,6 @@ Checks: > -cert-msc50-cpp, -clang-analyzer-optin.cplusplus.VirtualCall, -clang-diagnostic-unreachable-code-return, - -cppcoreguidelines-explicit-virtual-functions, -cppcoreguidelines-macro-usage, -cppcoreguidelines-owning-memory, -cppcoreguidelines-pro-bounds-array-to-pointer-decay, diff --git a/src/AlsaDriver.hpp b/src/AlsaDriver.hpp index a07eeff..92c303f 100644 --- a/src/AlsaDriver.hpp +++ b/src/AlsaDriver.hpp @@ -38,25 +38,27 @@ class AlsaDriver : public Driver { public: explicit AlsaDriver(Patchage* app); - ~AlsaDriver(); - void attach(bool launch_daemon); - void detach(); + ~AlsaDriver() override; - bool is_attached() const { return (_seq != nullptr); } + void attach(bool launch_daemon) override; + void detach() override; - void refresh(); - void destroy_all(); + bool is_attached() const override { return (_seq != nullptr); } - PatchagePort* create_port_view(Patchage* patchage, const PortID& id); + void refresh() override; + void destroy_all() override; - bool connect(PatchagePort* src_port, PatchagePort* dst_port); + PatchagePort* + create_port_view(Patchage* patchage, const PortID& id) override; - bool disconnect(PatchagePort* src_port, PatchagePort* dst_port); + bool connect(PatchagePort* src_port, PatchagePort* dst_port) override; + + bool disconnect(PatchagePort* src_port, PatchagePort* dst_port) override; void print_addr(snd_seq_addr_t addr); - void process_events(Patchage* app); + void process_events(Patchage* app) override; private: bool create_refresh_port(); diff --git a/src/JackDbusDriver.hpp b/src/JackDbusDriver.hpp index 1812298..acbdc77 100644 --- a/src/JackDbusDriver.hpp +++ b/src/JackDbusDriver.hpp @@ -37,20 +37,21 @@ class JackDriver : public Driver { public: explicit JackDriver(Patchage* app); - ~JackDriver(); - void attach(bool launch_daemon); - void detach(); + ~JackDriver() override; - bool is_attached() const; + void attach(bool launch_daemon) override; + void detach() override; + + bool is_attached() const override; bool is_realtime() const; - void refresh(); - void destroy_all(); + void refresh() override; + void destroy_all() override; - bool connect(PatchagePort* src, PatchagePort* dst); + bool connect(PatchagePort* src, PatchagePort* dst) override; - bool disconnect(PatchagePort* src, PatchagePort* dst); + bool disconnect(PatchagePort* src, PatchagePort* dst) override; uint32_t get_xruns(); void reset_xruns(); @@ -61,9 +62,10 @@ public: jack_nframes_t buffer_size(); bool set_buffer_size(jack_nframes_t size); - void process_events(Patchage*) {} + void process_events(Patchage*) override {} - PatchagePort* create_port_view(Patchage* patchage, const PortID& ref); + PatchagePort* + create_port_view(Patchage* patchage, const PortID& ref) override; private: void error_msg(const std::string& msg) const; diff --git a/src/JackDriver.hpp b/src/JackDriver.hpp index 16860f6..c5e075e 100644 --- a/src/JackDriver.hpp +++ b/src/JackDriver.hpp @@ -41,26 +41,29 @@ class JackDriver : public Driver { public: explicit JackDriver(Patchage* app); - ~JackDriver(); - void attach(bool launch_daemon); - void detach(); + ~JackDriver() override; + + void attach(bool launch_daemon) override; + void detach() override; + + bool is_attached() const override { return (_client != nullptr); } - bool is_attached() const { return (_client != nullptr); } bool is_realtime() const { return _client && jack_is_realtime(_client); } - void refresh(); - void destroy_all(); + void refresh() override; + void destroy_all() override; bool port_names(const PortID& id, std::string& module_name, std::string& port_name); - PatchagePort* create_port_view(Patchage* patchage, const PortID& id); + PatchagePort* + create_port_view(Patchage* patchage, const PortID& id) override; - bool connect(PatchagePort* src, PatchagePort* dst); + bool connect(PatchagePort* src, PatchagePort* dst) override; - bool disconnect(PatchagePort* src, PatchagePort* dst); + bool disconnect(PatchagePort* src, PatchagePort* dst) override; uint32_t get_xruns() { return _xruns; } void reset_xruns(); @@ -73,7 +76,7 @@ public: jack_nframes_t buffer_size(); bool set_buffer_size(jack_nframes_t size); - void process_events(Patchage* app); + void process_events(Patchage* app) override; private: PatchagePort* diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp index a94b9c7..40ec51c 100644 --- a/src/PatchageCanvas.hpp +++ b/src/PatchageCanvas.hpp @@ -71,7 +71,7 @@ public: void remove_port(const PortID& id); - void clear(); + void clear() override; private: using PortIndex = std::map; diff --git a/src/PatchageModule.hpp b/src/PatchageModule.hpp index 6135a0e..249f0ce 100644 --- a/src/PatchageModule.hpp +++ b/src/PatchageModule.hpp @@ -41,7 +41,7 @@ public: double x = 0, double y = 0); - ~PatchageModule(); + ~PatchageModule() override; void split(); void join(); @@ -60,7 +60,7 @@ public: const std::string& name() const { return _name; } protected: - bool on_event(GdkEvent* ev); + bool on_event(GdkEvent* ev) override; Patchage* _app; Gtk::Menu* _menu; diff --git a/src/PatchagePort.hpp b/src/PatchagePort.hpp index 68ab873..8811feb 100644 --- a/src/PatchagePort.hpp +++ b/src/PatchagePort.hpp @@ -60,7 +60,7 @@ public: signal_event().connect(sigc::mem_fun(this, &PatchagePort::on_event)); } - virtual ~PatchagePort() = default; + ~PatchagePort() override = default; /** Returns the full name of this port, as "modulename:portname" */ std::string full_name() const @@ -78,7 +78,7 @@ public: } } - bool on_event(GdkEvent* ev) + bool on_event(GdkEvent* ev) override { if (ev->type != GDK_BUTTON_PRESS || ev->button.button != 3) { return false; diff --git a/src/warnings.hpp b/src/warnings.hpp index 14dbbe0..a420b16 100644 --- a/src/warnings.hpp +++ b/src/warnings.hpp @@ -19,16 +19,19 @@ #if defined(__clang__) -# define PATCHAGE_DISABLE_GANV_WARNINGS \ - _Pragma("clang diagnostic push") \ +# define PATCHAGE_DISABLE_GANV_WARNINGS \ + _Pragma("clang diagnostic push") \ + _Pragma("clang diagnostic ignored \"-Wsuggest-destructor-override\"") \ + _Pragma("clang diagnostic ignored \"-Wsuggest-override\"") \ _Pragma("clang diagnostic ignored \"-Wunused-parameter\"") # define PATCHAGE_RESTORE_WARNINGS _Pragma("clang diagnostic pop") #elif defined(__GNUC__) -# define PATCHAGE_DISABLE_GANV_WARNINGS \ - _Pragma("GCC diagnostic push") \ +# define PATCHAGE_DISABLE_GANV_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wsuggest-override\"") \ _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") # define PATCHAGE_RESTORE_WARNINGS _Pragma("GCC diagnostic pop") diff --git a/wscript b/wscript index 3cbfec5..c401d12 100644 --- a/wscript +++ b/wscript @@ -61,7 +61,6 @@ def configure(conf): 'clang': [ '-Wno-alloca', '-Wno-cast-qual', - '-Wno-covered-switch-default', '-Wno-documentation-unknown-command', '-Wno-double-promotion', '-Wno-float-conversion', @@ -72,9 +71,6 @@ def configure(conf): '-Wno-shadow', '-Wno-shorten-64-to-32', '-Wno-sign-conversion', - '-Wno-stack-protector', - '-Wno-suggest-override', - '-Wno-suggest-destructor-override', ], 'gcc': [ '-Wno-alloca', @@ -108,7 +104,6 @@ def configure(conf): '-Wno-conditionally-supported', '-Wno-effc++', '-Wno-old-style-cast', - '-Wno-suggest-override', ], }) -- cgit v1.2.1