diff options
author | Max Kellermann <max@duempel.org> | 2014-10-02 10:07:46 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-10-02 19:17:46 +0200 |
commit | 19dd59f38c7aa07b0290ef22cac9fd7266b92042 (patch) | |
tree | 272dd81a1735cd3eb23540db5d2a4e764e4b6478 /src/storage/plugins | |
parent | 37501d9bc7b4bf4b0d82d1d686fcc20b3fb856eb (diff) | |
download | mpd-19dd59f38c7aa07b0290ef22cac9fd7266b92042.tar.gz mpd-19dd59f38c7aa07b0290ef22cac9fd7266b92042.tar.xz mpd-19dd59f38c7aa07b0290ef22cac9fd7266b92042.zip |
storage: remove redundant "virtual" keywords
"override" implies "virtual".
Diffstat (limited to '')
-rw-r--r-- | src/storage/plugins/LocalStorage.cxx | 19 | ||||
-rw-r--r-- | src/storage/plugins/NfsStorage.cxx | 17 | ||||
-rw-r--r-- | src/storage/plugins/SmbclientStorage.cxx | 17 |
3 files changed, 25 insertions, 28 deletions
diff --git a/src/storage/plugins/LocalStorage.cxx b/src/storage/plugins/LocalStorage.cxx index 34d11569c..b965ceea8 100644 --- a/src/storage/plugins/LocalStorage.cxx +++ b/src/storage/plugins/LocalStorage.cxx @@ -45,9 +45,8 @@ public: } /* virtual methods from class StorageDirectoryReader */ - virtual const char *Read() override; - virtual bool GetInfo(bool follow, FileInfo &info, - Error &error) override; + const char *Read() override; + bool GetInfo(bool follow, FileInfo &info, Error &error) override; }; class LocalStorage final : public Storage { @@ -62,17 +61,17 @@ public: } /* virtual methods from class Storage */ - virtual bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, - Error &error) override; + bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, + Error &error) override; - virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8, - Error &error) override; + StorageDirectoryReader *OpenDirectory(const char *uri_utf8, + Error &error) override; - virtual std::string MapUTF8(const char *uri_utf8) const override; + std::string MapUTF8(const char *uri_utf8) const override; - virtual AllocatedPath MapFS(const char *uri_utf8) const override; + AllocatedPath MapFS(const char *uri_utf8) const override; - virtual const char *MapToRelativeUTF8(const char *uri_utf8) const override; + const char *MapToRelativeUTF8(const char *uri_utf8) const override; private: AllocatedPath MapFS(const char *uri_utf8, Error &error) const; diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx index 0dedf5ca5..1c712f68f 100644 --- a/src/storage/plugins/NfsStorage.cxx +++ b/src/storage/plugins/NfsStorage.cxx @@ -56,9 +56,8 @@ public: virtual ~NfsDirectoryReader(); /* virtual methods from class StorageDirectoryReader */ - virtual const char *Read() override; - virtual bool GetInfo(bool follow, FileInfo &info, - Error &error) override; + const char *Read() override; + bool GetInfo(bool follow, FileInfo &info, Error &error) override; }; class NfsStorage final : public Storage { @@ -75,15 +74,15 @@ public: } /* virtual methods from class Storage */ - virtual bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, - Error &error) override; + bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, + Error &error) override; - virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8, - Error &error) override; + StorageDirectoryReader *OpenDirectory(const char *uri_utf8, + Error &error) override; - virtual std::string MapUTF8(const char *uri_utf8) const override; + std::string MapUTF8(const char *uri_utf8) const override; - virtual const char *MapToRelativeUTF8(const char *uri_utf8) const override; + const char *MapToRelativeUTF8(const char *uri_utf8) const override; }; static std::string diff --git a/src/storage/plugins/SmbclientStorage.cxx b/src/storage/plugins/SmbclientStorage.cxx index 9a181de89..6eda05073 100644 --- a/src/storage/plugins/SmbclientStorage.cxx +++ b/src/storage/plugins/SmbclientStorage.cxx @@ -43,9 +43,8 @@ public: virtual ~SmbclientDirectoryReader(); /* virtual methods from class StorageDirectoryReader */ - virtual const char *Read() override; - virtual bool GetInfo(bool follow, FileInfo &info, - Error &error) override; + const char *Read() override; + bool GetInfo(bool follow, FileInfo &info, Error &error) override; }; class SmbclientStorage final : public Storage { @@ -64,15 +63,15 @@ public: } /* virtual methods from class Storage */ - virtual bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, - Error &error) override; + bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, + Error &error) override; - virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8, - Error &error) override; + StorageDirectoryReader *OpenDirectory(const char *uri_utf8, + Error &error) override; - virtual std::string MapUTF8(const char *uri_utf8) const override; + std::string MapUTF8(const char *uri_utf8) const override; - virtual const char *MapToRelativeUTF8(const char *uri_utf8) const override; + const char *MapToRelativeUTF8(const char *uri_utf8) const override; }; std::string |