From 4324e6b427b3ed93b6dd74bde0be49b9508b678e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 18 Dec 2017 11:04:06 +0100 Subject: Fix override specifiers --- ingen/AtomWriter.hpp | 2 +- ingen/Interface.hpp | 4 +--- ingen/client/ClientStore.hpp | 2 +- ingen/client/SigClientInterface.hpp | 2 +- ingen/client/SocketClient.hpp | 4 ++-- ingen/client/ThreadedSigClientInterface.hpp | 6 ++++-- src/server/Broadcaster.hpp | 2 +- src/server/EventWriter.hpp | 8 +++++--- tests/TestClient.hpp | 2 +- 9 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp index 20d152e6..2366df05 100644 --- a/ingen/AtomWriter.hpp +++ b/ingen/AtomWriter.hpp @@ -38,7 +38,7 @@ public: ~AtomWriter(); - Raul::URI uri() const { + Raul::URI uri() const override { return Raul::URI("ingen:/clients/atom_writer"); } diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp index a516892c..3b33f813 100644 --- a/ingen/Interface.hpp +++ b/ingen/Interface.hpp @@ -51,9 +51,7 @@ public: virtual Raul::URI uri() const = 0; - virtual SPtr respondee() const { - return SPtr(); - } + virtual SPtr respondee() const { return SPtr(); } virtual void set_respondee(SPtr respondee) {} diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index 2724df9a..45662afb 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -58,7 +58,7 @@ public: Log& log, SPtr emitter = SPtr()); - Raul::URI uri() const { return Raul::URI("ingen:/clients/store"); } + Raul::URI uri() const override { return Raul::URI("ingen:/clients/store"); } SPtr object(const Raul::Path& path) const; SPtr plugin(const Raul::URI& uri) const; diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp index 04af2dd9..4acc903b 100644 --- a/ingen/client/SigClientInterface.hpp +++ b/ingen/client/SigClientInterface.hpp @@ -46,7 +46,7 @@ class INGEN_API SigClientInterface : public Ingen::Interface, public: SigClientInterface() {} - Raul::URI uri() const { return Raul::URI("ingen:/clients/sig"); } + Raul::URI uri() const override { return Raul::URI("ingen:/clients/sig"); } INGEN_SIGNAL(message, void, Message) diff --git a/ingen/client/SocketClient.hpp b/ingen/client/SocketClient.hpp index 3a7a7e69..d1b19a68 100644 --- a/ingen/client/SocketClient.hpp +++ b/ingen/client/SocketClient.hpp @@ -37,11 +37,11 @@ public: , _reader(world, *respondee.get(), sock) {} - virtual SPtr respondee() const { + SPtr respondee() const override { return _respondee; } - virtual void set_respondee(SPtr respondee) { + void set_respondee(SPtr respondee) override { _respondee = respondee; } diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp index 8fa36c90..6457d559 100644 --- a/ingen/client/ThreadedSigClientInterface.hpp +++ b/ingen/client/ThreadedSigClientInterface.hpp @@ -55,7 +55,9 @@ public: : message_slot(_signal_message.make_slot()) {} - virtual Raul::URI uri() const { return Raul::URI("ingen:/clients/sig_queue"); } + Raul::URI uri() const override { + return Raul::URI("ingen:/clients/sig_queue"); + } void message(const Message& msg) override { std::lock_guard lock(_mutex); @@ -63,7 +65,7 @@ public: } /** Process all queued events - Called from GTK thread to emit signals. */ - bool emit_signals() { + bool emit_signals() override { // Get pending signals std::vector sigs; { diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp index 93b6ec8f..ded10896 100644 --- a/src/server/Broadcaster.hpp +++ b/src/server/Broadcaster.hpp @@ -97,7 +97,7 @@ public: } } - Raul::URI uri() const { return Raul::URI("ingen:/broadcaster"); } + Raul::URI uri() const override { return Raul::URI("ingen:/broadcaster"); } private: friend class Transfer; diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp index 74c27b27..2c7e5666 100644 --- a/src/server/EventWriter.hpp +++ b/src/server/EventWriter.hpp @@ -40,13 +40,15 @@ class EventWriter : public Interface public: explicit EventWriter(Engine& engine); - Raul::URI uri() const { return Raul::URI("ingen:/clients/event_writer"); } + Raul::URI uri() const override { + return Raul::URI("ingen:/clients/event_writer"); + } - virtual SPtr respondee() const { + SPtr respondee() const override { return _respondee; } - virtual void set_respondee(SPtr respondee) { + void set_respondee(SPtr respondee) override { _respondee = respondee; } diff --git a/tests/TestClient.hpp b/tests/TestClient.hpp index 317ecd97..64b9d1d5 100644 --- a/tests/TestClient.hpp +++ b/tests/TestClient.hpp @@ -29,7 +29,7 @@ public: explicit TestClient(Log& log) : _log(log) {} ~TestClient() {} - Raul::URI uri() const { return Raul::URI("ingen:testClient"); } + Raul::URI uri() const override { return Raul::URI("ingen:testClient"); } void message(const Message& msg) override { if (const Response* const response = boost::get(&msg)) { -- cgit v1.2.1