Commit 19dd59f3 authored by Max Kellermann's avatar Max Kellermann

storage: remove redundant "virtual" keywords

"override" implies "virtual".
parent 37501d9b
......@@ -55,9 +55,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;
};
const char *
......
......@@ -122,17 +122,17 @@ public:
bool Unmount(const char *uri);
/* 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;
virtual StorageDirectoryReader *OpenDirectory(const char *uri,
StorageDirectoryReader *OpenDirectory(const char *uri,
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:
template<typename T>
......
......@@ -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,
bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info,
Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8,
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;
......
......@@ -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,
bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info,
Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8,
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
......
......@@ -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,
bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info,
Error &error) override;
virtual StorageDirectoryReader *OpenDirectory(const char *uri_utf8,
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
......
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