[Scummvm-git-logs] scummvm master -> 423f4cce6b75f92aaffcd41bf7cd841518ddbd4e
ccawley2011
ccawley2011 at gmail.com
Thu Aug 12 14:17:03 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
423f4cce6b BACKENDS: Add override and final keywords
Commit: 423f4cce6b75f92aaffcd41bf7cd841518ddbd4e
https://github.com/scummvm/scummvm/commit/423f4cce6b75f92aaffcd41bf7cd841518ddbd4e
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-12T15:16:48+01:00
Commit Message:
BACKENDS: Add override and final keywords
Changed paths:
backends/fs/amigaos/amigaos-fs-factory.h
backends/fs/amigaos/amigaos-fs.h
backends/fs/chroot/chroot-fs-factory.h
backends/fs/chroot/chroot-fs.h
backends/fs/devoptab/devoptab-fs-factory.h
backends/fs/morphos/morphos-fs-factory.h
backends/fs/morphos/morphos-fs.h
backends/fs/n64/n64-fs-factory.h
backends/fs/n64/n64-fs.h
backends/fs/n64/romfsstream.h
backends/fs/posix/posix-fs-factory.h
backends/fs/posix/posix-fs.h
backends/fs/posix/posix-iostream.h
backends/fs/ps3/ps3-fs-factory.h
backends/fs/psp/psp-fs-factory.h
backends/fs/psp/psp-stream.h
backends/fs/riscos/riscos-fs-factory.h
backends/fs/riscos/riscos-fs.h
backends/fs/symbian/symbian-fs-factory.h
backends/fs/symbian/symbian-fs.h
backends/fs/symbian/symbianstream.h
backends/platform/dc/dc-fs.cpp
backends/platform/dc/dc.h
diff --git a/backends/fs/amigaos/amigaos-fs-factory.h b/backends/fs/amigaos/amigaos-fs-factory.h
index 432caf6fcf..2a1627636d 100644
--- a/backends/fs/amigaos/amigaos-fs-factory.h
+++ b/backends/fs/amigaos/amigaos-fs-factory.h
@@ -30,11 +30,11 @@
*
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class AmigaOSFilesystemFactory : public FilesystemFactory {
+class AmigaOSFilesystemFactory final : public FilesystemFactory {
public:
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
};
#endif /*AMIGAOS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/amigaos/amigaos-fs.h b/backends/fs/amigaos/amigaos-fs.h
index 80a86f2736..0ea399abb7 100644
--- a/backends/fs/amigaos/amigaos-fs.h
+++ b/backends/fs/amigaos/amigaos-fs.h
@@ -42,7 +42,7 @@
*
* Parts of this class are documented in the base interface class, AbstractFSNode.
*/
-class AmigaOSFilesystemNode : public AbstractFSNode {
+class AmigaOSFilesystemNode final : public AbstractFSNode {
protected:
/**
* The main file lock.
@@ -100,23 +100,23 @@ public:
/**
* Destructor.
*/
- virtual ~AmigaOSFilesystemNode();
-
- virtual bool exists() const;
- virtual Common::String getDisplayName() const { return _sDisplayName; }
- virtual Common::String getName() const { return _sDisplayName; }
- virtual Common::String getPath() const { return _sPath; }
- virtual bool isDirectory() const { return _bIsDirectory; }
- virtual bool isReadable() const;
- virtual bool isWritable() const;
-
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
-
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::SeekableWriteStream *createWriteStream();
- virtual bool createDirectory();
+ virtual ~AmigaOSFilesystemNode() override;
+
+ virtual bool exists() const override;
+ virtual Common::String getDisplayName() const override { return _sDisplayName; }
+ virtual Common::String getName() const override { return _sDisplayName; }
+ virtual Common::String getPath() const override { return _sPath; }
+ virtual bool isDirectory() const override { return _bIsDirectory; }
+ virtual bool isReadable() const override;
+ virtual bool isWritable() const override;
+
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual AbstractFSNode *getParent() const override;
+
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::SeekableWriteStream *createWriteStream() override;
+ virtual bool createDirectory() override;
};
diff --git a/backends/fs/chroot/chroot-fs-factory.h b/backends/fs/chroot/chroot-fs-factory.h
index d53e5af398..a0f3e43572 100644
--- a/backends/fs/chroot/chroot-fs-factory.h
+++ b/backends/fs/chroot/chroot-fs-factory.h
@@ -31,13 +31,13 @@
* features. Instances are, for example, the FluidSynth code, and the POSIX
* plugin code.
*/
-class ChRootFilesystemFactory : public FilesystemFactory {
+class ChRootFilesystemFactory final : public FilesystemFactory {
public:
explicit ChRootFilesystemFactory(const Common::String &root);
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
private:
const Common::String _root;
diff --git a/backends/fs/chroot/chroot-fs.h b/backends/fs/chroot/chroot-fs.h
index 98e56db72e..9e6bf95cde 100644
--- a/backends/fs/chroot/chroot-fs.h
+++ b/backends/fs/chroot/chroot-fs.h
@@ -25,7 +25,7 @@
#include "backends/fs/posix/posix-fs.h"
-class ChRootFilesystemNode : public AbstractFSNode {
+class ChRootFilesystemNode final : public AbstractFSNode {
Common::String _root;
POSIXFilesystemNode *_realNode;
@@ -33,23 +33,23 @@ class ChRootFilesystemNode : public AbstractFSNode {
public:
ChRootFilesystemNode(const Common::String &root, const Common::String &path);
- virtual ~ChRootFilesystemNode();
-
- virtual bool exists() const;
- virtual Common::String getDisplayName() const;
- virtual Common::String getName() const;
- virtual Common::String getPath() const;
- virtual bool isDirectory() const;
- virtual bool isReadable() const;
- virtual bool isWritable() const;
-
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
-
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::SeekableWriteStream *createWriteStream();
- virtual bool createDirectory();
+ virtual ~ChRootFilesystemNode() override;
+
+ virtual bool exists() const override;
+ virtual Common::String getDisplayName() const override;
+ virtual Common::String getName() const override;
+ virtual Common::String getPath() const override;
+ virtual bool isDirectory() const override;
+ virtual bool isReadable() const override;
+ virtual bool isWritable() const override;
+
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual AbstractFSNode *getParent() const override;
+
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::SeekableWriteStream *createWriteStream() override;
+ virtual bool createDirectory() override;
private:
static Common::String addPathComponent(const Common::String &path, const Common::String &component);
diff --git a/backends/fs/devoptab/devoptab-fs-factory.h b/backends/fs/devoptab/devoptab-fs-factory.h
index d65801bd9a..e95a952759 100644
--- a/backends/fs/devoptab/devoptab-fs-factory.h
+++ b/backends/fs/devoptab/devoptab-fs-factory.h
@@ -30,7 +30,7 @@
* top-level directory listing all registered devoptab devices but
* that otherwise implement the POSIX APIs.
*/
-class DevoptabFilesystemFactory : public DrivesPOSIXFilesystemFactory {
+class DevoptabFilesystemFactory final : public DrivesPOSIXFilesystemFactory {
public:
DevoptabFilesystemFactory();
};
diff --git a/backends/fs/morphos/morphos-fs-factory.h b/backends/fs/morphos/morphos-fs-factory.h
index db76a4b1b5..af7f4b1f2f 100644
--- a/backends/fs/morphos/morphos-fs-factory.h
+++ b/backends/fs/morphos/morphos-fs-factory.h
@@ -30,11 +30,11 @@
*
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class MorphOSFilesystemFactory : public FilesystemFactory {
+class MorphOSFilesystemFactory final : public FilesystemFactory {
public:
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
};
#endif /*MORPHOS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/morphos/morphos-fs.h b/backends/fs/morphos/morphos-fs.h
index 69695a2270..ea223143ae 100644
--- a/backends/fs/morphos/morphos-fs.h
+++ b/backends/fs/morphos/morphos-fs.h
@@ -42,7 +42,7 @@
*
* Parts of this class are documented in the base interface class, AbstractFSNode.
*/
-class MorphOSFilesystemNode : public AbstractFSNode {
+class MorphOSFilesystemNode final : public AbstractFSNode {
protected:
/**
* The main file lock.
@@ -100,24 +100,24 @@ public:
/**
* Destructor.
*/
- virtual ~MorphOSFilesystemNode();
+ virtual ~MorphOSFilesystemNode() override;
- virtual bool exists() const;
- virtual Common::String getDisplayName() const { return _sDisplayName; }
- virtual Common::String getName() const { return _sDisplayName; }
- virtual Common::String getPath() const { return _sPath; }
- virtual bool isDirectory() const { return _bIsDirectory; }
- virtual bool isReadable() const { return true; }
- virtual bool isWritable() const { return true; }
+ virtual bool exists() const override;
+ virtual Common::String getDisplayName() const override { return _sDisplayName; }
+ virtual Common::String getName() const override { return _sDisplayName; }
+ virtual Common::String getPath() const override { return _sPath; }
+ virtual bool isDirectory() const override { return _bIsDirectory; }
+ virtual bool isReadable() const override { return true; }
+ virtual bool isWritable() const override { return true; }
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::SeekableWriteStream *createWriteStream();
- virtual bool createDirectory();
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::SeekableWriteStream *createWriteStream() override;
+ virtual bool createDirectory() override;
};
diff --git a/backends/fs/n64/n64-fs-factory.h b/backends/fs/n64/n64-fs-factory.h
index 0a6ac8f41e..a0ff447ef1 100644
--- a/backends/fs/n64/n64-fs-factory.h
+++ b/backends/fs/n64/n64-fs-factory.h
@@ -30,10 +30,10 @@
*
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class N64FilesystemFactory : public FilesystemFactory {
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+class N64FilesystemFactory final : public FilesystemFactory {
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
};
#endif /*N64_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/n64/n64-fs.h b/backends/fs/n64/n64-fs.h
index 5c4b9beb12..1dff25ce7b 100644
--- a/backends/fs/n64/n64-fs.h
+++ b/backends/fs/n64/n64-fs.h
@@ -30,7 +30,7 @@
*
* Parts of this class are documented in the base interface class, AbstractFSNode.
*/
-class N64FilesystemNode : public AbstractFSNode {
+class N64FilesystemNode final : public AbstractFSNode {
protected:
Common::String _displayName;
Common::String _path;
@@ -51,29 +51,29 @@ public:
*/
N64FilesystemNode(const Common::String &p, bool verify = true);
- virtual bool exists() const;
- virtual Common::String getDisplayName() const {
+ virtual bool exists() const override;
+ virtual Common::String getDisplayName() const override {
return _displayName;
}
- virtual Common::String getName() const {
+ virtual Common::String getName() const override {
return _displayName;
}
- virtual Common::String getPath() const {
+ virtual Common::String getPath() const override {
return _path;
}
- virtual bool isDirectory() const {
+ virtual bool isDirectory() const override {
return _isDirectory;
}
- virtual bool isReadable() const;
- virtual bool isWritable() const;
+ virtual bool isReadable() const override;
+ virtual bool isWritable() const override;
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::SeekableWriteStream *createWriteStream();
- virtual bool createDirectory();
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::SeekableWriteStream *createWriteStream() override;
+ virtual bool createDirectory() override;
};
#endif
diff --git a/backends/fs/n64/romfsstream.h b/backends/fs/n64/romfsstream.h
index 3931e39b23..c70d4fe5cb 100644
--- a/backends/fs/n64/romfsstream.h
+++ b/backends/fs/n64/romfsstream.h
@@ -28,7 +28,7 @@
#include "common/stream.h"
#include "common/str.h"
-class RomfsStream : public Common::SeekableReadStream, public Common::SeekableWriteStream, public Common::NonCopyable {
+class RomfsStream final : public Common::SeekableReadStream, public Common::SeekableWriteStream, public Common::NonCopyable {
protected:
/** File handle to the actual file. */
void *_handle;
@@ -41,19 +41,19 @@ public:
static RomfsStream *makeFromPath(const Common::String &path, bool writeMode);
RomfsStream(void *handle);
- virtual ~RomfsStream();
+ virtual ~RomfsStream() override;
- virtual bool err() const;
- virtual void clearErr();
- virtual bool eos() const;
+ virtual bool err() const override;
+ virtual void clearErr() override;
+ virtual bool eos() const override;
- virtual uint32 write(const void *dataPtr, uint32 dataSize);
- virtual bool flush();
+ virtual uint32 write(const void *dataPtr, uint32 dataSize) override;
+ virtual bool flush() override;
- virtual int64 pos() const;
- virtual int64 size() const;
- virtual bool seek(int64 offs, int whence = SEEK_SET);
- virtual uint32 read(void *dataPtr, uint32 dataSize);
+ virtual int64 pos() const override;
+ virtual int64 size() const override;
+ virtual bool seek(int64 offs, int whence = SEEK_SET) override;
+ virtual uint32 read(void *dataPtr, uint32 dataSize) override;
};
#endif
diff --git a/backends/fs/posix/posix-fs-factory.h b/backends/fs/posix/posix-fs-factory.h
index 7aedde5b01..c08563c232 100644
--- a/backends/fs/posix/posix-fs-factory.h
+++ b/backends/fs/posix/posix-fs-factory.h
@@ -32,9 +32,9 @@
*/
class POSIXFilesystemFactory : public FilesystemFactory {
protected:
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
};
#endif /*POSIX_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/posix/posix-fs.h b/backends/fs/posix/posix-fs.h
index e8e4f5da14..c3f071c9db 100644
--- a/backends/fs/posix/posix-fs.h
+++ b/backends/fs/posix/posix-fs.h
@@ -54,21 +54,21 @@ public:
*/
POSIXFilesystemNode(const Common::String &path);
- virtual bool exists() const;
- virtual Common::String getDisplayName() const { return _displayName; }
- virtual Common::String getName() const { return _displayName; }
- virtual Common::String getPath() const { return _path; }
- virtual bool isDirectory() const { return _isDirectory; }
- virtual bool isReadable() const;
- virtual bool isWritable() const;
+ virtual bool exists() const override;
+ virtual Common::String getDisplayName() const override { return _displayName; }
+ virtual Common::String getName() const override { return _displayName; }
+ virtual Common::String getPath() const override { return _path; }
+ virtual bool isDirectory() const override { return _isDirectory; }
+ virtual bool isReadable() const override;
+ virtual bool isWritable() const override;
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::SeekableWriteStream *createWriteStream();
- virtual bool createDirectory();
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::SeekableWriteStream *createWriteStream() override;
+ virtual bool createDirectory() override;
protected:
/**
diff --git a/backends/fs/posix/posix-iostream.h b/backends/fs/posix/posix-iostream.h
index fe9207d6a4..536b8d470c 100644
--- a/backends/fs/posix/posix-iostream.h
+++ b/backends/fs/posix/posix-iostream.h
@@ -28,7 +28,7 @@
/**
* A file input / output stream using POSIX interfaces
*/
-class PosixIoStream : public StdioStream {
+class PosixIoStream final : public StdioStream {
public:
#if defined(ANDROID_PLAIN_PORT)
bool createdWithSAF;
@@ -39,7 +39,7 @@ public:
PosixIoStream(void *handle);
#if defined(ANDROID_PLAIN_PORT)
PosixIoStream(void *handle, bool bCreatedWithSAF, Common::String sHackyFilename);
- ~PosixIoStream();
+ ~PosixIoStream() override;
#endif
int64 size() const override;
diff --git a/backends/fs/ps3/ps3-fs-factory.h b/backends/fs/ps3/ps3-fs-factory.h
index f7d54a90fd..646e89f5de 100644
--- a/backends/fs/ps3/ps3-fs-factory.h
+++ b/backends/fs/ps3/ps3-fs-factory.h
@@ -30,8 +30,8 @@
*
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class PS3FilesystemFactory : public POSIXFilesystemFactory {
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
+class PS3FilesystemFactory final : public POSIXFilesystemFactory {
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
};
#endif /*PS3_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/psp/psp-fs-factory.h b/backends/fs/psp/psp-fs-factory.h
index 26888487c2..f827b88065 100644
--- a/backends/fs/psp/psp-fs-factory.h
+++ b/backends/fs/psp/psp-fs-factory.h
@@ -31,11 +31,11 @@
*
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class PSPFilesystemFactory : public FilesystemFactory, public Common::Singleton<PSPFilesystemFactory> {
+class PSPFilesystemFactory final : public FilesystemFactory, public Common::Singleton<PSPFilesystemFactory> {
public:
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
protected:
PSPFilesystemFactory() {}
diff --git a/backends/fs/psp/psp-stream.h b/backends/fs/psp/psp-stream.h
index 850a01cb08..4e2a020b76 100644
--- a/backends/fs/psp/psp-stream.h
+++ b/backends/fs/psp/psp-stream.h
@@ -33,7 +33,7 @@
/**
* Class to handle special suspend/resume needs of PSP IO Streams
*/
-class PspIoStream : public Common::SeekableReadStream, public Common::SeekableWriteStream, public Common::NonCopyable, public Suspendable {
+class PspIoStream final : public Common::SeekableReadStream, public Common::SeekableWriteStream, public Common::NonCopyable, public Suspendable {
protected:
SceUID _handle; // file handle
Common::String _path;
@@ -67,7 +67,7 @@ public:
static PspIoStream *makeFromPath(const Common::String &path, bool writeMode);
PspIoStream(const Common::String &path, bool writeMode);
- virtual ~PspIoStream();
+ virtual ~PspIoStream() override;
SceUID open(); // open the file pointed to by the file path
diff --git a/backends/fs/riscos/riscos-fs-factory.h b/backends/fs/riscos/riscos-fs-factory.h
index 4bed2b5f08..9dd74f32e0 100644
--- a/backends/fs/riscos/riscos-fs-factory.h
+++ b/backends/fs/riscos/riscos-fs-factory.h
@@ -30,11 +30,11 @@
*
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class RISCOSFilesystemFactory : public FilesystemFactory {
+class RISCOSFilesystemFactory final : public FilesystemFactory {
protected:
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
};
#endif /*RISCOS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/riscos/riscos-fs.h b/backends/fs/riscos/riscos-fs.h
index 379c47f4db..6e094db1b6 100644
--- a/backends/fs/riscos/riscos-fs.h
+++ b/backends/fs/riscos/riscos-fs.h
@@ -30,7 +30,7 @@
*
* Parts of this class are documented in the base interface class, AbstractFSNode.
*/
-class RISCOSFilesystemNode : public AbstractFSNode {
+class RISCOSFilesystemNode final : public AbstractFSNode {
protected:
Common::String _displayName;
Common::String _nativePath;
@@ -54,21 +54,21 @@ public:
*/
RISCOSFilesystemNode(const Common::String &path);
- virtual bool exists() const;
- virtual Common::String getDisplayName() const { return _displayName; }
- virtual Common::String getName() const { return _displayName; }
- virtual Common::String getPath() const { return _path; }
- virtual bool isDirectory() const { return _isDirectory; }
- virtual bool isReadable() const;
- virtual bool isWritable() const;
+ virtual bool exists() const override;
+ virtual Common::String getDisplayName() const override { return _displayName; }
+ virtual Common::String getName() const override { return _displayName; }
+ virtual Common::String getPath() const override { return _path; }
+ virtual bool isDirectory() const override { return _isDirectory; }
+ virtual bool isReadable() const override;
+ virtual bool isWritable() const override;
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::SeekableWriteStream *createWriteStream();
- virtual bool createDirectory();
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::SeekableWriteStream *createWriteStream() override;
+ virtual bool createDirectory() override;
private:
/**
* Tests and sets the _isValid and _isDirectory flags, using OS_File 20.
diff --git a/backends/fs/symbian/symbian-fs-factory.h b/backends/fs/symbian/symbian-fs-factory.h
index 940b58e22f..d99a0b9e4c 100644
--- a/backends/fs/symbian/symbian-fs-factory.h
+++ b/backends/fs/symbian/symbian-fs-factory.h
@@ -30,11 +30,11 @@
*
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class SymbianFilesystemFactory : public FilesystemFactory {
+class SymbianFilesystemFactory final : public FilesystemFactory {
public:
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
};
#endif /*SYMBIAN_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/symbian/symbian-fs.h b/backends/fs/symbian/symbian-fs.h
index e1715669bf..121a7ec3cd 100644
--- a/backends/fs/symbian/symbian-fs.h
+++ b/backends/fs/symbian/symbian-fs.h
@@ -30,7 +30,7 @@
*
* Parts of this class are documented in the base interface class, AbstractFSNode.
*/
-class SymbianFilesystemNode : public AbstractFSNode {
+class SymbianFilesystemNode final : public AbstractFSNode {
protected:
Common::String _displayName;
Common::String _path;
@@ -52,21 +52,21 @@ public:
*/
SymbianFilesystemNode(const Common::String &path);
- virtual bool exists() const;
- virtual Common::String getDisplayName() const { return _displayName; }
- virtual Common::String getName() const { return _displayName; }
- virtual Common::String getPath() const { return _path; }
- virtual bool isDirectory() const { return _isDirectory; }
- virtual bool isReadable() const;
- virtual bool isWritable() const;
+ virtual bool exists() const override;
+ virtual Common::String getDisplayName() const override { return _displayName; }
+ virtual Common::String getName() const override { return _displayName; }
+ virtual Common::String getPath() const override { return _path; }
+ virtual bool isDirectory() const override { return _isDirectory; }
+ virtual bool isReadable() const override;
+ virtual bool isWritable() const override;
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::SeekableWriteStream *createWriteStream();
- virtual bool createDirectory();
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::SeekableWriteStream *createWriteStream() override;
+ virtual bool createDirectory() override;
};
#endif
diff --git a/backends/fs/symbian/symbianstream.h b/backends/fs/symbian/symbianstream.h
index 2c604ae9f7..cd2c3bea9f 100644
--- a/backends/fs/symbian/symbianstream.h
+++ b/backends/fs/symbian/symbianstream.h
@@ -28,7 +28,7 @@
#include "common/stream.h"
#include "common/str.h"
-class SymbianStdioStream : public Common::SeekableReadStream, public Common::SeekableWriteStream, public Common::NonCopyable {
+class SymbianStdioStream final : public Common::SeekableReadStream, public Common::SeekableWriteStream, public Common::NonCopyable {
protected:
/** File handle to the actual file. */
void *_handle;
@@ -41,19 +41,19 @@ public:
static SymbianStdioStream *makeFromPath(const Common::String &path, bool writeMode);
SymbianStdioStream(void *handle);
- virtual ~SymbianStdioStream();
+ virtual ~SymbianStdioStream() override;
- bool err() const;
- void clearErr();
- bool eos() const;
+ bool err() const override;
+ void clearErr() override;
+ bool eos() const override;
- virtual uint32 write(const void *dataPtr, uint32 dataSize);
- virtual bool flush();
+ virtual uint32 write(const void *dataPtr, uint32 dataSize) override;
+ virtual bool flush() override;
- virtual int64 pos() const;
- virtual int64 size() const;
- bool seek(int64 offs, int whence = SEEK_SET);
- uint32 read(void *dataPtr, uint32 dataSize);
+ virtual int64 pos() const override;
+ virtual int64 size() const override;
+ bool seek(int64 offs, int whence = SEEK_SET) override;
+ uint32 read(void *dataPtr, uint32 dataSize) override;
};
#endif
diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp
index 5b08eeddc3..a0e5fc303f 100644
--- a/backends/platform/dc/dc-fs.cpp
+++ b/backends/platform/dc/dc-fs.cpp
@@ -44,44 +44,44 @@ protected:
public:
RoninCDFileNode(const Common::String &path) : _path(path) {}
- virtual bool exists() const { return true; }
- virtual Common::String getName() const { return lastPathComponent(_path, '/'); }
- virtual Common::String getPath() const { return _path; }
- virtual bool isDirectory() const { return false; }
- virtual bool isReadable() const { return true; }
- virtual bool isWritable() const { return false; }
+ virtual bool exists() const override { return true; }
+ virtual Common::String getName() const override { return lastPathComponent(_path, '/'); }
+ virtual Common::String getPath() const override { return _path; }
+ virtual bool isDirectory() const override { return false; }
+ virtual bool isReadable() const override { return true; }
+ virtual bool isWritable() const override { return false; }
- virtual AbstractFSNode *getChild(const Common::String &n) const { return NULL; }
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const { return false; }
- virtual AbstractFSNode *getParent() const;
+ virtual AbstractFSNode *getChild(const Common::String &n) const override { return NULL; }
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override { return false; }
+ virtual AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::SeekableWriteStream *createWriteStream() { return 0; }
- virtual bool createDirectory() { return false; }
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::SeekableWriteStream *createWriteStream() override { return 0; }
+ virtual bool createDirectory() override { return false; }
static AbstractFSNode *makeFileNodePath(const Common::String &path);
};
/* A directory */
-class RoninCDDirectoryNode : public RoninCDFileNode {
+class RoninCDDirectoryNode final : public RoninCDFileNode {
public:
RoninCDDirectoryNode(const Common::String &path) : RoninCDFileNode(path) {}
- virtual bool isDirectory() const { return true; }
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual Common::SeekableReadStream *createReadStream() { return 0; }
- virtual bool createDirectory() { return true; }
+ virtual bool isDirectory() const override { return true; }
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual Common::SeekableReadStream *createReadStream() override { return 0; }
+ virtual bool createDirectory() override { return true; }
};
/* A file/directory which does not exist */
-class RoninCDNonexistingNode : public RoninCDFileNode {
+class RoninCDNonexistingNode final : public RoninCDFileNode {
public:
RoninCDNonexistingNode(const Common::String &path) : RoninCDFileNode(path) {}
- virtual bool exists() const { return false; }
- virtual bool isReadable() const { return false; }
- virtual Common::SeekableReadStream *createReadStream() { return 0; }
+ virtual bool exists() const override { return false; }
+ virtual bool isReadable() const override { return false; }
+ virtual Common::SeekableReadStream *createReadStream() override { return 0; }
};
AbstractFSNode *RoninCDFileNode::makeFileNodePath(const Common::String &path) {
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index d411eef4b2..7665ae8420 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -179,9 +179,9 @@ public:
void mouseToSoftKbd(int x, int y, int &rx, int &ry) const;
// Filesystem
- AbstractFSNode *makeRootFileNode() const;
- AbstractFSNode *makeCurrentDirectoryFileNode() const;
- AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
private:
More information about the Scummvm-git-logs
mailing list