Skip to content

M
mpd
Commit 19dd59f3 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

storage: remove redundant "virtual" keywords

"override" implies "virtual".
parent 37501d9b
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 30 deletions
src/storage/CompositeStorage.cxx
View file @ 19dd59f3
...@@ -55,9 +55,8 @@ public: ...@@ -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 *
......
src/storage/CompositeStorage.hxx
View file @ 19dd59f3
...@@ -122,17 +122,17 @@ public: ...@@ -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>
......
src/storage/plugins/LocalStorage.cxx
View file @ 19dd59f3
...@@ -45,9 +45,8 @@ public: ...@@ -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: ...@@ -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;
......
src/storage/plugins/NfsStorage.cxx
View file @ 19dd59f3
...@@ -56,9 +56,8 @@ public: ...@@ -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: ...@@ -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
......
src/storage/plugins/SmbclientStorage.cxx
View file @ 19dd59f3
...@@ -43,9 +43,8 @@ public: ...@@ -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: ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment