aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/storage/CompositeStorage.cxx5
-rw-r--r--src/storage/CompositeStorage.hxx14
-rw-r--r--src/storage/plugins/LocalStorage.cxx19
-rw-r--r--src/storage/plugins/NfsStorage.cxx17
-rw-r--r--src/storage/plugins/SmbclientStorage.cxx17
5 files changed, 34 insertions, 38 deletions
diff --git a/src/storage/CompositeStorage.cxx b/src/storage/CompositeStorage.cxx
index bd093e459..89a2fc756 100644
--- a/src/storage/CompositeStorage.cxx
+++ b/src/storage/CompositeStorage.cxx
@@ -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 *
diff --git a/src/storage/CompositeStorage.hxx b/src/storage/CompositeStorage.hxx
index 3daa45ee3..c3695c79d 100644
--- a/src/storage/CompositeStorage.hxx
+++ b/src/storage/CompositeStorage.hxx
@@ -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,
- Error &error) override;
+ bool GetInfo(const char *uri, bool follow, FileInfo &info,
+ Error &error) override;
- virtual StorageDirectoryReader *OpenDirectory(const char *uri,
- Error &error) override;
+ 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>
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