oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

storage: remove redundant "virtual" keywords

Browse Source 
"override" implies "virtual".
This commit is contained in:
Max Kellermann 2014-10-02 10:07:46 +02:00
parent 37501d9bc7
commit 19dd59f38c
5 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/CompositeStorage.cxx
View File

@ -55,9 +55,8 @@ public:
} }
/* virtual methods from class StorageDirectoryReader */ /* virtual methods from class StorageDirectoryReader */
virtual const char *Read() override; const char *Read() override;
virtual bool GetInfo(bool follow, FileInfo &info, bool GetInfo(bool follow, FileInfo &info, Error &error) override;
Error &error) override;
}; };
const char * const char *

14
src/storage/CompositeStorage.hxx
View File

@ -122,17 +122,17 @@ public:
bool Unmount(const char *uri); bool Unmount(const char *uri);
/* virtual methods from class Storage */ /* virtual methods from class Storage */
virtual bool GetInfo(const char *uri, bool follow, FileInfo &info, bool GetInfo(const char *uri, bool follow, FileInfo &info,
Error &error) override; Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri, StorageDirectoryReader *OpenDirectory(const char *uri,
Error &error) override; Error &error) override;
virtual std::string MapUTF8(const char *uri) const override; std::string MapUTF8(const char *uri) const override;
virtual AllocatedPath MapFS(const char *uri) const override; AllocatedPath MapFS(const char *uri) const override;
virtual const char *MapToRelativeUTF8(const char *uri) const override; const char *MapToRelativeUTF8(const char *uri) const override;
private: private:
template<typename T> template<typename T>

19
src/storage/plugins/LocalStorage.cxx
View File

@ -45,9 +45,8 @@ public:
} }
/* virtual methods from class StorageDirectoryReader */ /* virtual methods from class StorageDirectoryReader */
virtual const char *Read() override; const char *Read() override;
virtual bool GetInfo(bool follow, FileInfo &info, bool GetInfo(bool follow, FileInfo &info, Error &error) override;
Error &error) override;
}; };
class LocalStorage final : public Storage { class LocalStorage final : public Storage {
@ -62,17 +61,17 @@ public:
} }
/* virtual methods from class Storage */ /* virtual methods from class Storage */
virtual bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info,
Error &error) override; Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8, StorageDirectoryReader *OpenDirectory(const char *uri_utf8,
Error &error) override; 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: private:
AllocatedPath MapFS(const char *uri_utf8, Error &error) const; AllocatedPath MapFS(const char *uri_utf8, Error &error) const;

17
src/storage/plugins/NfsStorage.cxx
View File

@ -56,9 +56,8 @@ public:
virtual ~NfsDirectoryReader(); virtual ~NfsDirectoryReader();
/* virtual methods from class StorageDirectoryReader */ /* virtual methods from class StorageDirectoryReader */
virtual const char *Read() override; const char *Read() override;
virtual bool GetInfo(bool follow, FileInfo &info, bool GetInfo(bool follow, FileInfo &info, Error &error) override;
Error &error) override;
}; };
class NfsStorage final : public Storage { class NfsStorage final : public Storage {
@ -75,15 +74,15 @@ public:
} }
/* virtual methods from class Storage */ /* virtual methods from class Storage */
virtual bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info,
Error &error) override; Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8, StorageDirectoryReader *OpenDirectory(const char *uri_utf8,
Error &error) override; 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 static std::string

17
src/storage/plugins/SmbclientStorage.cxx
View File

@ -43,9 +43,8 @@ public:
virtual ~SmbclientDirectoryReader(); virtual ~SmbclientDirectoryReader();
/* virtual methods from class StorageDirectoryReader */ /* virtual methods from class StorageDirectoryReader */
virtual const char *Read() override; const char *Read() override;
virtual bool GetInfo(bool follow, FileInfo &info, bool GetInfo(bool follow, FileInfo &info, Error &error) override;
Error &error) override;
}; };
class SmbclientStorage final : public Storage { class SmbclientStorage final : public Storage {
@ -64,15 +63,15 @@ public:
} }
/* virtual methods from class Storage */ /* virtual methods from class Storage */
virtual bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info,
Error &error) override; Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8, StorageDirectoryReader *OpenDirectory(const char *uri_utf8,
Error &error) override; 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 std::string