From df3317110766f659b6cc3e80b61c5fd88c4ce6b3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Dec 2014 13:46:07 +0100 Subject: db/{simple,proxy}, ...: add "override" keywords Fixes -Winconsistent-missing-override (clang 3.6). --- src/db/ProxyDatabasePlugin.cxx | 2 +- src/db/SimpleDatabasePlugin.hxx | 2 +- src/filter/ChainFilterPlugin.cxx | 9 +++++---- src/filter/NormalizeFilterPlugin.cxx | 9 +++++---- src/filter/ReplayGainFilterPlugin.cxx | 9 +++++---- src/filter/RouteFilterPlugin.cxx | 9 +++++---- src/filter/VolumeFilterPlugin.cxx | 8 ++++---- 7 files changed, 26 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx index cb1bcdc6b..92fe6ebac 100644 --- a/src/db/ProxyDatabasePlugin.cxx +++ b/src/db/ProxyDatabasePlugin.cxx @@ -57,7 +57,7 @@ public: virtual void Close() override; virtual Song *GetSong(const char *uri_utf8, Error &error) const override; - virtual void ReturnSong(Song *song) const; + void ReturnSong(Song *song) const override; virtual bool Visit(const DatabaseSelection &selection, VisitDirectory visit_directory, diff --git a/src/db/SimpleDatabasePlugin.hxx b/src/db/SimpleDatabasePlugin.hxx index dfe981dd8..6424feaa6 100644 --- a/src/db/SimpleDatabasePlugin.hxx +++ b/src/db/SimpleDatabasePlugin.hxx @@ -61,7 +61,7 @@ public: virtual Song *GetSong(const char *uri_utf8, Error &error) const override; - virtual void ReturnSong(Song *song) const; + void ReturnSong(Song *song) const override; virtual bool Visit(const DatabaseSelection &selection, VisitDirectory visit_directory, diff --git a/src/filter/ChainFilterPlugin.cxx b/src/filter/ChainFilterPlugin.cxx index cb52b86ca..b000d53ce 100644 --- a/src/filter/ChainFilterPlugin.cxx +++ b/src/filter/ChainFilterPlugin.cxx @@ -52,10 +52,11 @@ public: children.emplace_back(name, filter); } - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual const void *FilterPCM(const void *src, size_t src_size, - size_t *dest_size_r, Error &error); + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + const void *FilterPCM(const void *src, size_t src_size, + size_t *dest_size_r, Error &error) override; private: /** diff --git a/src/filter/NormalizeFilterPlugin.cxx b/src/filter/NormalizeFilterPlugin.cxx index 6c4f6b0e5..60d0f3204 100644 --- a/src/filter/NormalizeFilterPlugin.cxx +++ b/src/filter/NormalizeFilterPlugin.cxx @@ -34,10 +34,11 @@ class NormalizeFilter final : public Filter { PcmBuffer buffer; public: - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual const void *FilterPCM(const void *src, size_t src_size, - size_t *dest_size_r, Error &error); + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + const void *FilterPCM(const void *src, size_t src_size, + size_t *dest_size_r, Error &error) override; }; static Filter * diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx index b2dcde4cc..b79b4fb87 100644 --- a/src/filter/ReplayGainFilterPlugin.cxx +++ b/src/filter/ReplayGainFilterPlugin.cxx @@ -116,10 +116,11 @@ public: */ void Update(); - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual const void *FilterPCM(const void *src, size_t src_size, - size_t *dest_size_r, Error &error); + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + const void *FilterPCM(const void *src, size_t src_size, + size_t *dest_size_r, Error &error) override; }; void diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/RouteFilterPlugin.cxx index d9042c21f..335cfe6bd 100644 --- a/src/filter/RouteFilterPlugin.cxx +++ b/src/filter/RouteFilterPlugin.cxx @@ -120,10 +120,11 @@ public: */ bool Configure(const config_param ¶m, Error &error); - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual const void *FilterPCM(const void *src, size_t src_size, - size_t *dest_size_r, Error &error); + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + const void *FilterPCM(const void *src, size_t src_size, + size_t *dest_size_r, Error &error) override; }; bool diff --git a/src/filter/VolumeFilterPlugin.cxx b/src/filter/VolumeFilterPlugin.cxx index 1b663f6eb..66afdea88 100644 --- a/src/filter/VolumeFilterPlugin.cxx +++ b/src/filter/VolumeFilterPlugin.cxx @@ -57,10 +57,10 @@ public: volume = _volume; } - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual const void *FilterPCM(const void *src, size_t src_size, - size_t *dest_size_r, Error &error); + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + const void *FilterPCM(const void *src, size_t src_size, + size_t *dest_size_r, Error &error) override; }; static constexpr Domain volume_domain("pcm_volume"); -- cgit v1.2.3