[Scummvm-git-logs] scummvm master -> b11c5ace90b0df8e3f23381d42154715f49da43d
bluegr
noreply at scummvm.org
Sun Nov 14 12:31:43 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:
b11c5ace90 BACKENDS: JANITORIAL: Remove 'virtual' when override is specified
Commit: b11c5ace90b0df8e3f23381d42154715f49da43d
https://github.com/scummvm/scummvm/commit/b11c5ace90b0df8e3f23381d42154715f49da43d
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:31:41+02:00
Commit Message:
BACKENDS: JANITORIAL: Remove 'virtual' when override is specified
Changed paths:
backends/base-backend.h
backends/cloud/cloudmanager.h
backends/dialogs/win32/win32-dialogs.h
backends/events/default/default-events.h
backends/events/maemosdl/maemosdl-events.h
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/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/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/fs/wii/wii-fs-factory.h
backends/fs/wii/wii-fs.h
backends/fs/windows/windows-fs-factory.h
backends/fs/windows/windows-fs.h
backends/graphics/maemosdl/maemosdl-graphics.h
backends/graphics/null/null-graphics.h
backends/graphics/opengl/opengl-graphics.h
backends/graphics/opengl/shader.h
backends/graphics/openglsdl/openglsdl-graphics.h
backends/graphics/sdl/sdl-graphics.h
backends/graphics/surfacesdl/surfacesdl-graphics.h
backends/graphics/windowed.h
backends/graphics3d/openglsdl/openglsdl-graphics3d.h
backends/modular-backend.h
backends/mutex/3ds/3ds-mutex.cpp
backends/mutex/pthread/pthread-mutex.cpp
backends/mutex/sdl/sdl-mutex.cpp
backends/mutex/wii/wii-mutex.cpp
backends/platform/android/android.h
backends/platform/android/asset-archive.h
backends/platform/android/graphics.h
backends/platform/android3d/graphics.h
backends/platform/dc/dc-fs.cpp
backends/platform/dc/selector.cpp
backends/platform/ios7/ios7_osys_main.cpp
backends/platform/ios7/ios7_osys_main.h
backends/platform/maemo/maemo.h
backends/platform/sdl/macosx/macosx-window.h
backends/platform/sdl/macosx/macosx.h
backends/platform/sdl/morphos/morphos.h
backends/platform/sdl/opendingux/opendingux.h
backends/platform/sdl/posix/posix.h
backends/platform/sdl/psp2/psp2.h
backends/platform/sdl/sdl.h
backends/platform/sdl/switch/switch.h
backends/platform/sdl/win32/win32-window.h
backends/platform/sdl/win32/win32.cpp
backends/platform/sdl/win32/win32.h
backends/platform/symbian/src/SymbianOS.h
backends/platform/wii/options.h
backends/platform/wii/osystem.h
backends/plugins/wii/wii-provider.cpp
backends/plugins/win32/win32-provider.cpp
backends/taskbar/win32/win32-taskbar.h
backends/text-to-speech/linux/linux-text-to-speech.h
backends/text-to-speech/macosx/macosx-text-to-speech.h
backends/text-to-speech/windows/windows-text-to-speech.h
backends/updates/win32/win32-updates.h
base/plugins.h
diff --git a/backends/base-backend.h b/backends/base-backend.h
index 230531b4d1..624c183b7b 100644
--- a/backends/base-backend.h
+++ b/backends/base-backend.h
@@ -32,13 +32,13 @@
*/
class BaseBackend : public OSystem {
public:
- virtual void initBackend() override;
+ void initBackend() override;
using OSystem::setScaler;
- virtual bool setScaler(const char *name, int factor) override final;
- virtual void displayMessageOnOSD(const Common::U32String &msg) override;
- virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override {}
- virtual void fillScreen(uint32 col) override;
+ bool setScaler(const char *name, int factor) override final;
+ void displayMessageOnOSD(const Common::U32String &msg) override;
+ void displayActivityIconOnOSD(const Graphics::Surface *icon) override {}
+ void fillScreen(uint32 col) override;
};
class EventsBaseBackend : virtual public BaseBackend, Common::EventSource {
diff --git a/backends/cloud/cloudmanager.h b/backends/cloud/cloudmanager.h
index 2d6c0bad43..e56c9ae4cc 100644
--- a/backends/cloud/cloudmanager.h
+++ b/backends/cloud/cloudmanager.h
@@ -86,7 +86,7 @@ class CloudManager : public Common::Singleton<CloudManager>, public Common::Even
* The periodical polling is used to update the OSD icon indicating
* background sync activity.
*/
- virtual bool pollEvent(Common::Event &event) override;
+ bool pollEvent(Common::Event &event) override;
public:
CloudManager();
diff --git a/backends/dialogs/win32/win32-dialogs.h b/backends/dialogs/win32/win32-dialogs.h
index ea8326d8df..7016fc4fd0 100644
--- a/backends/dialogs/win32/win32-dialogs.h
+++ b/backends/dialogs/win32/win32-dialogs.h
@@ -35,7 +35,7 @@ class Win32DialogManager final : public Common::DialogManager {
public:
Win32DialogManager(SdlWindow_Win32 *window);
virtual ~Win32DialogManager();
- virtual DialogResult showFileBrowser(const Common::U32String &title, Common::FSNode &choice, bool isDirBrowser) override;
+ DialogResult showFileBrowser(const Common::U32String &title, Common::FSNode &choice, bool isDirBrowser) override;
private:
SdlWindow_Win32 *_window;
diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h
index 97cb76aac9..42101cb24b 100644
--- a/backends/events/default/default-events.h
+++ b/backends/events/default/default-events.h
@@ -63,19 +63,19 @@ public:
DefaultEventManager(Common::EventSource *boss);
~DefaultEventManager();
- virtual void init() override;
- virtual bool pollEvent(Common::Event &event) override;
- virtual void pushEvent(const Common::Event &event) override;
- virtual void purgeMouseEvents() override;
- virtual void purgeKeyboardEvents() override;
+ void init() override;
+ bool pollEvent(Common::Event &event) override;
+ void pushEvent(const Common::Event &event) override;
+ void purgeMouseEvents() override;
+ void purgeKeyboardEvents() override;
- virtual Common::Point getMousePos() const override { return _mousePos; }
- virtual int getButtonState() const override { return _buttonState; }
- virtual int getModifierState() const override { return _modifierState; }
- virtual int shouldQuit() const override { return _shouldQuit; }
- virtual int shouldReturnToLauncher() const override { return _shouldReturnToLauncher; }
- virtual void resetReturnToLauncher() override { _shouldReturnToLauncher = false; }
- virtual void resetQuit() override { _shouldQuit = false; }
+ Common::Point getMousePos() const override { return _mousePos; }
+ int getButtonState() const override { return _buttonState; }
+ int getModifierState() const override { return _modifierState; }
+ int shouldQuit() const override { return _shouldQuit; }
+ int shouldReturnToLauncher() const override { return _shouldReturnToLauncher; }
+ void resetReturnToLauncher() override { _shouldReturnToLauncher = false; }
+ void resetQuit() override { _shouldQuit = false; }
Common::Keymapper *getKeymapper() override { return _keymapper; }
Common::Keymap *getGlobalKeymap() override;
diff --git a/backends/events/maemosdl/maemosdl-events.h b/backends/events/maemosdl/maemosdl-events.h
index c3a9e4cace..995acdb964 100644
--- a/backends/events/maemosdl/maemosdl-events.h
+++ b/backends/events/maemosdl/maemosdl-events.h
@@ -38,9 +38,9 @@ public:
bool toggleClickMode();
protected:
- virtual bool remapKey(SDL_Event &ev, Common::Event &event) override;
- virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event) override;
- virtual bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event) override;
+ bool remapKey(SDL_Event &ev, Common::Event &event) override;
+ bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event) override;
+ bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event) override;
bool _clickEnabled;
};
@@ -49,7 +49,7 @@ class MaemoSdlEventObserver final : public Common::EventObserver {
public:
MaemoSdlEventObserver(MaemoSdlEventSource *eventSource);
- virtual bool notifyEvent(const Common::Event &event) override;
+ bool notifyEvent(const Common::Event &event) override;
private:
MaemoSdlEventSource *_eventSource;
};
diff --git a/backends/fs/amigaos/amigaos-fs-factory.h b/backends/fs/amigaos/amigaos-fs-factory.h
index 2a1627636d..64a0ab4cc1 100644
--- a/backends/fs/amigaos/amigaos-fs-factory.h
+++ b/backends/fs/amigaos/amigaos-fs-factory.h
@@ -32,9 +32,9 @@
*/
class AmigaOSFilesystemFactory final : public FilesystemFactory {
public:
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 eda197a35d..1b3e6bd7fe 100644
--- a/backends/fs/amigaos/amigaos-fs.h
+++ b/backends/fs/amigaos/amigaos-fs.h
@@ -100,23 +100,23 @@ public:
/**
* Destructor.
*/
- virtual ~AmigaOSFilesystemNode() override;
-
- virtual bool exists() const override;
- virtual Common::U32String 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;
+ ~AmigaOSFilesystemNode() override;
+
+ bool exists() const override;
+ Common::U32String getDisplayName() const override { return _sDisplayName; }
+ Common::String getName() const override { return _sDisplayName; }
+ Common::String getPath() const override { return _sPath; }
+ bool isDirectory() const override { return _bIsDirectory; }
+ bool isReadable() const override;
+ bool isWritable() const override;
+
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
+
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ bool createDirectory() override;
};
diff --git a/backends/fs/chroot/chroot-fs-factory.h b/backends/fs/chroot/chroot-fs-factory.h
index a0f3e43572..f7e4ff17ee 100644
--- a/backends/fs/chroot/chroot-fs-factory.h
+++ b/backends/fs/chroot/chroot-fs-factory.h
@@ -35,9 +35,9 @@ class ChRootFilesystemFactory final : public FilesystemFactory {
public:
explicit ChRootFilesystemFactory(const Common::String &root);
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 98f5f6094a..5c697b7027 100644
--- a/backends/fs/chroot/chroot-fs.h
+++ b/backends/fs/chroot/chroot-fs.h
@@ -33,23 +33,23 @@ class ChRootFilesystemNode final : public AbstractFSNode {
public:
ChRootFilesystemNode(const Common::String &root, const Common::String &path);
- virtual ~ChRootFilesystemNode() override;
-
- virtual bool exists() const override;
- virtual Common::U32String 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;
+ ~ChRootFilesystemNode() override;
+
+ bool exists() const override;
+ Common::U32String getDisplayName() const override;
+ Common::String getName() const override;
+ Common::String getPath() const override;
+ bool isDirectory() const override;
+ bool isReadable() const override;
+ bool isWritable() const override;
+
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
+
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ bool createDirectory() override;
private:
static Common::String addPathComponent(const Common::String &path, const Common::String &component);
diff --git a/backends/fs/morphos/morphos-fs-factory.h b/backends/fs/morphos/morphos-fs-factory.h
index af7f4b1f2f..3f57163172 100644
--- a/backends/fs/morphos/morphos-fs-factory.h
+++ b/backends/fs/morphos/morphos-fs-factory.h
@@ -32,9 +32,9 @@
*/
class MorphOSFilesystemFactory final : public FilesystemFactory {
public:
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 2262c415a3..412c33bb64 100644
--- a/backends/fs/morphos/morphos-fs.h
+++ b/backends/fs/morphos/morphos-fs.h
@@ -100,24 +100,24 @@ public:
/**
* Destructor.
*/
- virtual ~MorphOSFilesystemNode() override;
+ ~MorphOSFilesystemNode() override;
- virtual bool exists() const override;
- virtual Common::U32String 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; }
+ bool exists() const override;
+ Common::U32String getDisplayName() const override { return _sDisplayName; }
+ Common::String getName() const override { return _sDisplayName; }
+ Common::String getPath() const override { return _sPath; }
+ bool isDirectory() const override { return _bIsDirectory; }
+ bool isReadable() const override { return true; }
+ bool isWritable() 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 AbstractFSNode *getParent() const override;
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream() override;
- virtual Common::SeekableWriteStream *createWriteStream() override;
- virtual bool createDirectory() override;
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ bool createDirectory() override;
};
diff --git a/backends/fs/n64/n64-fs-factory.h b/backends/fs/n64/n64-fs-factory.h
index a0ff447ef1..7fff474e3c 100644
--- a/backends/fs/n64/n64-fs-factory.h
+++ b/backends/fs/n64/n64-fs-factory.h
@@ -31,9 +31,9 @@
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
class N64FilesystemFactory final : public FilesystemFactory {
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 29841abbdf..51d4c30cc4 100644
--- a/backends/fs/n64/n64-fs.h
+++ b/backends/fs/n64/n64-fs.h
@@ -51,29 +51,29 @@ public:
*/
N64FilesystemNode(const Common::String &p, bool verify = true);
- virtual bool exists() const override;
- virtual Common::U32String getDisplayName() const override {
+ bool exists() const override;
+ Common::U32String getDisplayName() const override {
return _displayName;
}
- virtual Common::String getName() const override {
+ Common::String getName() const override {
return _displayName;
}
- virtual Common::String getPath() const override {
+ Common::String getPath() const override {
return _path;
}
- virtual bool isDirectory() const override {
+ bool isDirectory() const override {
return _isDirectory;
}
- virtual bool isReadable() const override;
- virtual bool isWritable() const override;
+ bool isReadable() const override;
+ 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;
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream() override;
- virtual Common::SeekableWriteStream *createWriteStream() override;
- virtual bool createDirectory() override;
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ bool createDirectory() override;
};
#endif
diff --git a/backends/fs/n64/romfsstream.h b/backends/fs/n64/romfsstream.h
index c70d4fe5cb..33c561e868 100644
--- a/backends/fs/n64/romfsstream.h
+++ b/backends/fs/n64/romfsstream.h
@@ -41,19 +41,19 @@ public:
static RomfsStream *makeFromPath(const Common::String &path, bool writeMode);
RomfsStream(void *handle);
- virtual ~RomfsStream() override;
+ ~RomfsStream() override;
- virtual bool err() const override;
- virtual void clearErr() override;
- virtual bool eos() const override;
+ bool err() const override;
+ void clearErr() override;
+ bool eos() const override;
- virtual uint32 write(const void *dataPtr, uint32 dataSize) override;
- virtual bool flush() override;
+ uint32 write(const void *dataPtr, uint32 dataSize) override;
+ bool flush() override;
- 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;
+ int64 pos() const override;
+ 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/fs/posix/posix-fs-factory.h b/backends/fs/posix/posix-fs-factory.h
index c08563c232..f9a74b178d 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 override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 380940db2d..c7013746e1 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 override;
- virtual Common::U32String 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;
+ bool exists() const override;
+ Common::U32String getDisplayName() const override { return _displayName; }
+ Common::String getName() const override { return _displayName; }
+ Common::String getPath() const override { return _path; }
+ bool isDirectory() const override { return _isDirectory; }
+ bool isReadable() const override;
+ 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;
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream() override;
- virtual Common::SeekableWriteStream *createWriteStream() override;
- virtual bool createDirectory() override;
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ bool createDirectory() override;
protected:
/**
diff --git a/backends/fs/ps3/ps3-fs-factory.h b/backends/fs/ps3/ps3-fs-factory.h
index 646e89f5de..bbf30a3c47 100644
--- a/backends/fs/ps3/ps3-fs-factory.h
+++ b/backends/fs/ps3/ps3-fs-factory.h
@@ -31,7 +31,7 @@
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
class PS3FilesystemFactory final : public POSIXFilesystemFactory {
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 f827b88065..f43d86456c 100644
--- a/backends/fs/psp/psp-fs-factory.h
+++ b/backends/fs/psp/psp-fs-factory.h
@@ -33,9 +33,9 @@
*/
class PSPFilesystemFactory final : public FilesystemFactory, public Common::Singleton<PSPFilesystemFactory> {
public:
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 4e2a020b76..537378cf46 100644
--- a/backends/fs/psp/psp-stream.h
+++ b/backends/fs/psp/psp-stream.h
@@ -67,7 +67,7 @@ public:
static PspIoStream *makeFromPath(const Common::String &path, bool writeMode);
PspIoStream(const Common::String &path, bool writeMode);
- virtual ~PspIoStream() override;
+ ~PspIoStream() override;
SceUID open(); // open the file pointed to by the file path
@@ -75,13 +75,13 @@ public:
void clearErr() override;
bool eos() const override;
- virtual uint32 write(const void *dataPtr, uint32 dataSize) override;
- virtual bool flush() override;
+ uint32 write(const void *dataPtr, uint32 dataSize) override;
+ bool flush() override;
- 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;
+ int64 pos() const override;
+ int64 size() const override;
+ bool seek(int64 offs, int whence = SEEK_SET) override;
+ uint32 read(void *dataPtr, uint32 dataSize) override;
// for suspending
int suspend() override; /* Suspendable interface (power manager) */
diff --git a/backends/fs/riscos/riscos-fs-factory.h b/backends/fs/riscos/riscos-fs-factory.h
index 9dd74f32e0..d012ea3e0a 100644
--- a/backends/fs/riscos/riscos-fs-factory.h
+++ b/backends/fs/riscos/riscos-fs-factory.h
@@ -32,9 +32,9 @@
*/
class RISCOSFilesystemFactory final : public FilesystemFactory {
protected:
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 3ecb515190..6257a74acd 100644
--- a/backends/fs/riscos/riscos-fs.h
+++ b/backends/fs/riscos/riscos-fs.h
@@ -54,21 +54,21 @@ public:
*/
RISCOSFilesystemNode(const Common::String &path);
- virtual bool exists() const override;
- virtual Common::U32String 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;
+ bool exists() const override;
+ Common::U32String getDisplayName() const override { return _displayName; }
+ Common::String getName() const override { return _displayName; }
+ Common::String getPath() const override { return _path; }
+ bool isDirectory() const override { return _isDirectory; }
+ bool isReadable() const override;
+ 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;
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream() override;
- virtual Common::SeekableWriteStream *createWriteStream() override;
- virtual bool createDirectory() override;
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ 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 d99a0b9e4c..11240b0548 100644
--- a/backends/fs/symbian/symbian-fs-factory.h
+++ b/backends/fs/symbian/symbian-fs-factory.h
@@ -32,9 +32,9 @@
*/
class SymbianFilesystemFactory final : public FilesystemFactory {
public:
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ 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 6e89c37da5..b943a70a7c 100644
--- a/backends/fs/symbian/symbian-fs.h
+++ b/backends/fs/symbian/symbian-fs.h
@@ -52,21 +52,21 @@ public:
*/
SymbianFilesystemNode(const Common::String &path);
- virtual bool exists() const override;
- virtual Common::U32String 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;
+ bool exists() const override;
+ Common::U32String getDisplayName() const override { return _displayName; }
+ Common::String getName() const override { return _displayName; }
+ Common::String getPath() const override { return _path; }
+ bool isDirectory() const override { return _isDirectory; }
+ bool isReadable() const override;
+ 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;
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream() override;
- virtual Common::SeekableWriteStream *createWriteStream() override;
- virtual bool createDirectory() override;
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ bool createDirectory() override;
};
#endif
diff --git a/backends/fs/symbian/symbianstream.h b/backends/fs/symbian/symbianstream.h
index cd2c3bea9f..1fa29dbed4 100644
--- a/backends/fs/symbian/symbianstream.h
+++ b/backends/fs/symbian/symbianstream.h
@@ -41,17 +41,17 @@ public:
static SymbianStdioStream *makeFromPath(const Common::String &path, bool writeMode);
SymbianStdioStream(void *handle);
- virtual ~SymbianStdioStream() override;
+ ~SymbianStdioStream() override;
bool err() const override;
void clearErr() override;
bool eos() const override;
- virtual uint32 write(const void *dataPtr, uint32 dataSize) override;
- virtual bool flush() override;
+ uint32 write(const void *dataPtr, uint32 dataSize) override;
+ bool flush() override;
- virtual int64 pos() const override;
- virtual int64 size() const override;
+ int64 pos() const override;
+ int64 size() const override;
bool seek(int64 offs, int whence = SEEK_SET) override;
uint32 read(void *dataPtr, uint32 dataSize) override;
};
diff --git a/backends/fs/wii/wii-fs-factory.h b/backends/fs/wii/wii-fs-factory.h
index 06bc7d4ded..346bcd0395 100644
--- a/backends/fs/wii/wii-fs-factory.h
+++ b/backends/fs/wii/wii-fs-factory.h
@@ -43,9 +43,9 @@ public:
kSMB
};
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
void asyncInit();
void asyncDeinit();
diff --git a/backends/fs/wii/wii-fs.h b/backends/fs/wii/wii-fs.h
index e0b9befa89..0a87a989ac 100644
--- a/backends/fs/wii/wii-fs.h
+++ b/backends/fs/wii/wii-fs.h
@@ -55,21 +55,21 @@ public:
WiiFilesystemNode(const Common::String &p);
WiiFilesystemNode(const Common::String &p, const struct stat *st);
- virtual bool exists() const override;
- virtual Common::U32String 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 { return _isReadable; }
- virtual bool isWritable() const override { return _isWritable; }
+ bool exists() const override;
+ Common::U32String getDisplayName() const override { return _displayName; }
+ Common::String getName() const override { return _displayName; }
+ Common::String getPath() const override { return _path; }
+ bool isDirectory() const override { return _isDirectory; }
+ bool isReadable() const override { return _isReadable; }
+ bool isWritable() const override { return _isWritable; }
- 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;
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream() override;
- virtual Common::SeekableWriteStream *createWriteStream() override;
- virtual bool createDirectory() override;
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ bool createDirectory() override;
};
#endif
diff --git a/backends/fs/windows/windows-fs-factory.h b/backends/fs/windows/windows-fs-factory.h
index 800500a2cd..47417a530f 100644
--- a/backends/fs/windows/windows-fs-factory.h
+++ b/backends/fs/windows/windows-fs-factory.h
@@ -32,9 +32,9 @@
*/
class WindowsFilesystemFactory final : public FilesystemFactory {
public:
- virtual AbstractFSNode *makeRootFileNode() const override;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
+ AbstractFSNode *makeRootFileNode() const override;
+ AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
};
#endif /*WINDOWS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/windows/windows-fs.h b/backends/fs/windows/windows-fs.h
index 52ef250145..e9d25956ed 100644
--- a/backends/fs/windows/windows-fs.h
+++ b/backends/fs/windows/windows-fs.h
@@ -66,21 +66,21 @@ public:
*/
WindowsFilesystemNode(const Common::String &path, const bool currentDir);
- virtual bool exists() const override;
- virtual Common::U32String 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;
+ bool exists() const override;
+ Common::U32String getDisplayName() const override { return _displayName; }
+ Common::String getName() const override { return _displayName; }
+ Common::String getPath() const override { return _path; }
+ bool isDirectory() const override { return _isDirectory; }
+ bool isReadable() const override;
+ 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;
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream() override;
- virtual Common::SeekableWriteStream *createWriteStream() override;
- virtual bool createDirectory() override;
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override;
+ bool createDirectory() override;
private:
/**
diff --git a/backends/graphics/maemosdl/maemosdl-graphics.h b/backends/graphics/maemosdl/maemosdl-graphics.h
index 6fe766eb67..0da639eb1a 100644
--- a/backends/graphics/maemosdl/maemosdl-graphics.h
+++ b/backends/graphics/maemosdl/maemosdl-graphics.h
@@ -32,7 +32,7 @@ public:
MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
protected:
- virtual bool loadGFXMode() override;
+ bool loadGFXMode() override;
};
#endif
diff --git a/backends/graphics/null/null-graphics.h b/backends/graphics/null/null-graphics.h
index 8e52eed8ba..b9138ed9be 100644
--- a/backends/graphics/null/null-graphics.h
+++ b/backends/graphics/null/null-graphics.h
@@ -54,7 +54,7 @@ public:
_format = format ? *format : Graphics::PixelFormat::createFormatCLUT8();
}
- virtual int getScreenChangeID() const override { return 0; }
+ int getScreenChangeID() const override { return 0; }
void beginGFXTransaction() override {}
OSystem::TransactionError endGFXTransaction() override { return OSystem::kTransactionSuccess; }
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index fc724c9334..0f1ca9fc67 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -60,64 +60,64 @@ public:
virtual ~OpenGLGraphicsManager();
// GraphicsManager API
- virtual bool hasFeature(OSystem::Feature f) const override;
- virtual void setFeatureState(OSystem::Feature f, bool enable) override;
- virtual bool getFeatureState(OSystem::Feature f) const override;
+ bool hasFeature(OSystem::Feature f) const override;
+ void setFeatureState(OSystem::Feature f, bool enable) override;
+ bool getFeatureState(OSystem::Feature f) const override;
- virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
- virtual int getDefaultGraphicsMode() const override;
- virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
- virtual int getGraphicsMode() const override;
+ const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
+ int getDefaultGraphicsMode() const override;
+ bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
+ int getGraphicsMode() const override;
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const override;
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
+ Graphics::PixelFormat getScreenFormat() const override;
+ Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
#endif
- virtual const OSystem::GraphicsMode *getSupportedStretchModes() const override;
- virtual int getDefaultStretchMode() const override;
- virtual bool setStretchMode(int mode) override;
- virtual int getStretchMode() const override;
+ const OSystem::GraphicsMode *getSupportedStretchModes() const override;
+ int getDefaultStretchMode() const override;
+ bool setStretchMode(int mode) override;
+ int getStretchMode() const override;
- virtual void beginGFXTransaction() override;
- virtual OSystem::TransactionError endGFXTransaction() override;
+ void beginGFXTransaction() override;
+ OSystem::TransactionError endGFXTransaction() override;
- virtual int getScreenChangeID() const override;
+ int getScreenChangeID() const override;
- virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format) override;
+ void initSize(uint width, uint height, const Graphics::PixelFormat *format) override;
- virtual int16 getWidth() const override;
- virtual int16 getHeight() const override;
+ int16 getWidth() const override;
+ int16 getHeight() const override;
- virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override;
- virtual void fillScreen(uint32 col) override;
+ void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override;
+ void fillScreen(uint32 col) override;
- virtual void updateScreen() override;
+ void updateScreen() override;
- virtual Graphics::Surface *lockScreen() override;
- virtual void unlockScreen() override;
+ Graphics::Surface *lockScreen() override;
+ void unlockScreen() override;
- virtual void setFocusRectangle(const Common::Rect& rect) override;
- virtual void clearFocusRectangle() override;
+ void setFocusRectangle(const Common::Rect& rect) override;
+ void clearFocusRectangle() override;
- virtual int16 getOverlayWidth() const override;
- virtual int16 getOverlayHeight() const override;
+ int16 getOverlayWidth() const override;
+ int16 getOverlayHeight() const override;
- virtual Graphics::PixelFormat getOverlayFormat() const override;
+ Graphics::PixelFormat getOverlayFormat() const override;
- virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
- virtual void clearOverlay() override;
- virtual void grabOverlay(Graphics::Surface &surface) const override;
+ void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
+ void clearOverlay() override;
+ void grabOverlay(Graphics::Surface &surface) const override;
- virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) override;
- virtual void setCursorPalette(const byte *colors, uint start, uint num) override;
+ void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) override;
+ void setCursorPalette(const byte *colors, uint start, uint num) override;
- virtual void displayMessageOnOSD(const Common::U32String &msg) override;
- virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override;
+ void displayMessageOnOSD(const Common::U32String &msg) override;
+ void displayActivityIconOnOSD(const Graphics::Surface *icon) override;
// PaletteManager interface
- virtual void setPalette(const byte *colors, uint start, uint num) override;
- virtual void grabPalette(byte *colors, uint start, uint num) const override;
+ void setPalette(const byte *colors, uint start, uint num) override;
+ void grabPalette(byte *colors, uint start, uint num) const override;
protected:
/**
@@ -309,9 +309,9 @@ protected:
*/
bool getGLPixelFormat(const Graphics::PixelFormat &pixelFormat, GLenum &glIntFormat, GLenum &glFormat, GLenum &glType) const;
- virtual bool gameNeedsAspectRatioCorrection() const override;
- virtual void recalculateDisplayAreas() override;
- virtual void handleResizeImpl(const int width, const int height) override;
+ bool gameNeedsAspectRatioCorrection() const override;
+ void recalculateDisplayAreas() override;
+ void handleResizeImpl(const int width, const int height) override;
/**
* The default pixel format of the backend.
diff --git a/backends/graphics/opengl/shader.h b/backends/graphics/opengl/shader.h
index ec1e516d14..f16950f0dc 100644
--- a/backends/graphics/opengl/shader.h
+++ b/backends/graphics/opengl/shader.h
@@ -55,7 +55,7 @@ class ShaderUniformInteger : public ShaderUniformValue {
public:
ShaderUniformInteger(GLint value) : _value(value) {}
- virtual void set(GLint location) const override;
+ void set(GLint location) const override;
private:
const GLint _value;
@@ -68,7 +68,7 @@ class ShaderUniformFloat : public ShaderUniformValue {
public:
ShaderUniformFloat(GLfloat value) : _value(value) {}
- virtual void set(GLint location) const override;
+ void set(GLint location) const override;
private:
const GLfloat _value;
@@ -83,7 +83,7 @@ public:
memcpy(_matrix, mat44, sizeof(_matrix));
}
- virtual void set(GLint location) const override;
+ void set(GLint location) const override;
private:
GLfloat _matrix[4*4];
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h
index 34d7ead3d9..55b771983f 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.h
+++ b/backends/graphics/openglsdl/openglsdl-graphics.h
@@ -35,34 +35,34 @@ public:
OpenGLSdlGraphicsManager(SdlEventSource *eventSource, SdlWindow *window);
virtual ~OpenGLSdlGraphicsManager();
- virtual bool hasFeature(OSystem::Feature f) const override;
- virtual void setFeatureState(OSystem::Feature f, bool enable) override;
- virtual bool getFeatureState(OSystem::Feature f) const override;
+ bool hasFeature(OSystem::Feature f) const override;
+ void setFeatureState(OSystem::Feature f, bool enable) override;
+ bool getFeatureState(OSystem::Feature f) const override;
- virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format) override;
- virtual void updateScreen() override;
+ void initSize(uint w, uint h, const Graphics::PixelFormat *format) override;
+ void updateScreen() override;
- virtual float getHiDPIScreenFactor() const override;
+ float getHiDPIScreenFactor() const override;
// EventObserver API
- virtual bool notifyEvent(const Common::Event &event) override;
+ bool notifyEvent(const Common::Event &event) override;
// SdlGraphicsManager API
- virtual void notifyVideoExpose() override;
- virtual void notifyResize(const int width, const int height) override;
+ void notifyVideoExpose() override;
+ void notifyResize(const int width, const int height) override;
protected:
- virtual bool loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format) override;
+ bool loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format) override;
- virtual void refreshScreen() override;
+ void refreshScreen() override;
- virtual void *getProcAddress(const char *name) const override;
+ void *getProcAddress(const char *name) const override;
- virtual void handleResizeImpl(const int width, const int height) override;
+ void handleResizeImpl(const int width, const int height) override;
- virtual bool saveScreenshot(const Common::String &filename) const override;
+ bool saveScreenshot(const Common::String &filename) const override;
- virtual int getGraphicsModeScale(int mode) const override {
+ int getGraphicsModeScale(int mode) const override {
#if SDL_VERSION_ATLEAST(2, 0, 0)
int windowWidth, windowHeight;
SDL_GetWindowSize(_window->getSDLWindow(), &windowWidth, &windowHeight);
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index d15dfa8a01..921eda5bfd 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -94,14 +94,14 @@ public:
*/
virtual bool notifyMousePosition(Common::Point &mouse);
- virtual bool showMouse(bool visible) override;
- virtual bool lockMouse(bool lock) override;
+ bool showMouse(bool visible) override;
+ bool lockMouse(bool lock) override;
virtual bool saveScreenshot(const Common::String &filename) const { return false; }
void saveScreenshot() override;
// Override from Common::EventObserver
- virtual bool notifyEvent(const Common::Event &event) override;
+ bool notifyEvent(const Common::Event &event) override;
/**
* A (subset) of the graphic manager's state. This is used when switching
@@ -133,7 +133,7 @@ public:
*/
SdlWindow *getWindow() const { return _window; }
- virtual void initSizeHint(const Graphics::ModeList &modes) override;
+ void initSizeHint(const Graphics::ModeList &modes) override;
Common::Keymap *getKeymap();
@@ -180,9 +180,9 @@ protected:
#endif
}
- virtual void setSystemMousePosition(const int x, const int y) override;
+ void setSystemMousePosition(const int x, const int y) override;
- virtual void handleResizeImpl(const int width, const int height) override;
+ void handleResizeImpl(const int width, const int height) override;
#if SDL_VERSION_ATLEAST(2, 0, 0)
public:
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.h b/backends/graphics/surfacesdl/surfacesdl-graphics.h
index 6da1f2637e..398a30952f 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.h
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.h
@@ -65,41 +65,41 @@ public:
SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
virtual ~SurfaceSdlGraphicsManager();
- virtual bool hasFeature(OSystem::Feature f) const override;
- virtual void setFeatureState(OSystem::Feature f, bool enable) override;
- virtual bool getFeatureState(OSystem::Feature f) const override;
-
- virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
- virtual int getDefaultGraphicsMode() const override;
- virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
- virtual int getGraphicsMode() const override;
- virtual uint getDefaultScaler() const override;
- virtual uint getDefaultScaleFactor() const override;
- virtual bool setScaler(uint mode, int factor) override;
- virtual uint getScaler() const override;
+ bool hasFeature(OSystem::Feature f) const override;
+ void setFeatureState(OSystem::Feature f, bool enable) override;
+ bool getFeatureState(OSystem::Feature f) const override;
+
+ const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
+ int getDefaultGraphicsMode() const override;
+ bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
+ int getGraphicsMode() const override;
+ uint getDefaultScaler() const override;
+ uint getDefaultScaleFactor() const override;
+ bool setScaler(uint mode, int factor) override;
+ uint getScaler() const override;
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const override { return _screenFormat; }
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
+ Graphics::PixelFormat getScreenFormat() const override { return _screenFormat; }
+ Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
#endif
#if SDL_VERSION_ATLEAST(2, 0, 0)
- virtual const OSystem::GraphicsMode *getSupportedStretchModes() const override;
- virtual int getDefaultStretchMode() const override;
- virtual bool setStretchMode(int mode) override;
- virtual int getStretchMode() const override;
+ const OSystem::GraphicsMode *getSupportedStretchModes() const override;
+ int getDefaultStretchMode() const override;
+ bool setStretchMode(int mode) override;
+ int getStretchMode() const override;
#endif
- virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL) override;
- virtual int getScreenChangeID() const override { return _screenChangeCount; }
+ void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL) override;
+ int getScreenChangeID() const override { return _screenChangeCount; }
- virtual void beginGFXTransaction() override;
- virtual OSystem::TransactionError endGFXTransaction() override;
+ void beginGFXTransaction() override;
+ OSystem::TransactionError endGFXTransaction() override;
- virtual int16 getHeight() const override;
- virtual int16 getWidth() const override;
+ int16 getHeight() const override;
+ int16 getWidth() const override;
protected:
// PaletteManager API
- virtual void setPalette(const byte *colors, uint start, uint num) override;
- virtual void grabPalette(byte *colors, uint start, uint num) const override;
+ void setPalette(const byte *colors, uint start, uint num) override;
+ void grabPalette(byte *colors, uint start, uint num) const override;
/**
* Convert from the SDL pixel format to Graphics::PixelFormat
@@ -108,35 +108,35 @@ protected:
*/
Graphics::PixelFormat convertSDLPixelFormat(SDL_PixelFormat *in) const;
public:
- virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override;
- virtual Graphics::Surface *lockScreen() override;
- virtual void unlockScreen() override;
- virtual void fillScreen(uint32 col) override;
- virtual void updateScreen() override;
- virtual void setFocusRectangle(const Common::Rect& rect) override;
- virtual void clearFocusRectangle() override;
-
- virtual Graphics::PixelFormat getOverlayFormat() const override { return _overlayFormat; }
- virtual void clearOverlay() override;
- virtual void grabOverlay(Graphics::Surface &surface) const override;
- virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
- virtual int16 getOverlayHeight() const override { return _videoMode.overlayHeight; }
- virtual int16 getOverlayWidth() const override { return _videoMode.overlayWidth; }
-
- virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override;
- virtual void setCursorPalette(const byte *colors, uint start, uint num) override;
+ void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override;
+ Graphics::Surface *lockScreen() override;
+ void unlockScreen() override;
+ void fillScreen(uint32 col) override;
+ void updateScreen() override;
+ void setFocusRectangle(const Common::Rect& rect) override;
+ void clearFocusRectangle() override;
+
+ Graphics::PixelFormat getOverlayFormat() const override { return _overlayFormat; }
+ void clearOverlay() override;
+ void grabOverlay(Graphics::Surface &surface) const override;
+ void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
+ int16 getOverlayHeight() const override { return _videoMode.overlayHeight; }
+ int16 getOverlayWidth() const override { return _videoMode.overlayWidth; }
+
+ void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override;
+ void setCursorPalette(const byte *colors, uint start, uint num) override;
#ifdef USE_OSD
- virtual void displayMessageOnOSD(const Common::U32String &msg) override;
- virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override;
+ void displayMessageOnOSD(const Common::U32String &msg) override;
+ void displayActivityIconOnOSD(const Graphics::Surface *icon) override;
#endif
// Override from Common::EventObserver
- virtual bool notifyEvent(const Common::Event &event) override;
+ bool notifyEvent(const Common::Event &event) override;
// SdlGraphicsManager interface
- virtual void notifyVideoExpose() override;
- virtual void notifyResize(const int width, const int height) override;
+ void notifyVideoExpose() override;
+ void notifyResize(const int width, const int height) override;
protected:
#ifdef USE_OSD
@@ -165,16 +165,16 @@ protected:
void drawOSD();
#endif
- virtual bool gameNeedsAspectRatioCorrection() const override {
+ bool gameNeedsAspectRatioCorrection() const override {
return _videoMode.aspectRatioCorrection;
}
- virtual int getGameRenderScale() const override {
+ int getGameRenderScale() const override {
return _videoMode.scaleFactor;
}
- virtual void handleResizeImpl(const int width, const int height) override;
+ void handleResizeImpl(const int width, const int height) override;
- virtual int getGraphicsModeScale(int mode) const override;
+ int getGraphicsModeScale(int mode) const override;
virtual void setupHardwareSize();
@@ -419,7 +419,7 @@ protected:
virtual void setAspectRatioCorrection(bool enable);
void setFilteringMode(bool enable);
- virtual bool saveScreenshot(const Common::String &filename) const override;
+ bool saveScreenshot(const Common::String &filename) const override;
virtual void setGraphicsModeIntern();
private:
diff --git a/backends/graphics/windowed.h b/backends/graphics/windowed.h
index e52aa806e4..4430c517db 100644
--- a/backends/graphics/windowed.h
+++ b/backends/graphics/windowed.h
@@ -54,7 +54,7 @@ public:
_cursorNeedsRedraw(false),
_cursorLastInActiveArea(true) {}
- virtual void showOverlay() override {
+ void showOverlay() override {
if (_overlayVisible)
return;
@@ -65,7 +65,7 @@ public:
_forceRedraw = true;
}
- virtual void hideOverlay() override {
+ void hideOverlay() override {
if (!_overlayVisible)
return;
@@ -76,9 +76,9 @@ public:
_forceRedraw = true;
}
- virtual bool isOverlayVisible() const override { return _overlayVisible; }
+ bool isOverlayVisible() const override { return _overlayVisible; }
- virtual void setShakePos(int shakeXOffset, int shakeYOffset) override {
+ void setShakePos(int shakeXOffset, int shakeYOffset) override {
if (_gameScreenShakeXOffset != shakeXOffset || _gameScreenShakeYOffset != shakeYOffset) {
_gameScreenShakeXOffset = shakeXOffset;
_gameScreenShakeYOffset = shakeYOffset;
@@ -222,7 +222,7 @@ protected:
*/
virtual void setSystemMousePosition(const int x, const int y) = 0;
- virtual bool showMouse(bool visible) override {
+ bool showMouse(bool visible) override {
if (_cursorVisible == visible) {
return visible;
}
diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.h b/backends/graphics3d/openglsdl/openglsdl-graphics3d.h
index 31a757e237..cee3bd1a57 100644
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.h
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.h
@@ -47,70 +47,70 @@ public:
virtual ~OpenGLSdlGraphics3dManager();
// GraphicsManager API - Features
- virtual bool hasFeature(OSystem::Feature f) const override;
- virtual bool getFeatureState(OSystem::Feature f) const override;
- virtual void setFeatureState(OSystem::Feature f, bool enable) override;
+ bool hasFeature(OSystem::Feature f) const override;
+ bool getFeatureState(OSystem::Feature f) const override;
+ void setFeatureState(OSystem::Feature f, bool enable) override;
- virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
- virtual int getDefaultGraphicsMode() const override;
- virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
- virtual int getGraphicsMode() const override;
+ const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
+ int getDefaultGraphicsMode() const override;
+ bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
+ int getGraphicsMode() const override;
- virtual void beginGFXTransaction() override;
- virtual OSystem::TransactionError endGFXTransaction() override;
+ void beginGFXTransaction() override;
+ OSystem::TransactionError endGFXTransaction() override;
// GraphicsManager API - Graphics mode
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const override { return _overlayFormat; }
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override {
+ Graphics::PixelFormat getScreenFormat() const override { return _overlayFormat; }
+ Common::List<Graphics::PixelFormat> getSupportedFormats() const override {
Common::List<Graphics::PixelFormat> supportedFormats;
return supportedFormats;
}
#endif
- virtual int getScreenChangeID() const override { return _screenChangeCount; }
- virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format) override;
- virtual int16 getHeight() const override;
- virtual int16 getWidth() const override;
+ int getScreenChangeID() const override { return _screenChangeCount; }
+ void initSize(uint w, uint h, const Graphics::PixelFormat *format) override;
+ int16 getHeight() const override;
+ int16 getWidth() const override;
// GraphicsManager API - Draw methods
- virtual void updateScreen() override;
+ void updateScreen() override;
// Following methods are not used by 3D graphics managers
- virtual void setPalette(const byte *colors, uint start, uint num) override {}
- virtual void grabPalette(byte *colors, uint start, uint num) const override {}
- virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override {}
- virtual Graphics::Surface *lockScreen() override { return nullptr; }
- virtual void unlockScreen() override {}
- virtual void fillScreen(uint32 col) override {}
- virtual void setShakePos(int shakeXOffset, int shakeYOffset) override {};
- virtual void setFocusRectangle(const Common::Rect& rect) override {}
- virtual void clearFocusRectangle() override {}
+ void setPalette(const byte *colors, uint start, uint num) override {}
+ void grabPalette(byte *colors, uint start, uint num) const override {}
+ void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override {}
+ Graphics::Surface *lockScreen() override { return nullptr; }
+ void unlockScreen() override {}
+ void fillScreen(uint32 col) override {}
+ void setShakePos(int shakeXOffset, int shakeYOffset) override {};
+ void setFocusRectangle(const Common::Rect& rect) override {}
+ void clearFocusRectangle() override {}
// GraphicsManager API - Overlay
- virtual void showOverlay() override;
- virtual void hideOverlay() override;
- virtual Graphics::PixelFormat getOverlayFormat() const override { return _overlayFormat; }
- virtual void clearOverlay() override;
- virtual void grabOverlay(Graphics::Surface &surface) const override;
- virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
+ void showOverlay() override;
+ void hideOverlay() override;
+ Graphics::PixelFormat getOverlayFormat() const override { return _overlayFormat; }
+ void clearOverlay() override;
+ void grabOverlay(Graphics::Surface &surface) const override;
+ void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
int16 getOverlayWidth() const override;
int16 getOverlayHeight() const override;
- virtual bool isOverlayVisible() const override { return _overlayVisible; }
+ bool isOverlayVisible() const override { return _overlayVisible; }
// GraphicsManager API - Mouse
- virtual bool showMouse(bool visible) override;
- virtual void warpMouse(int x, int y) override;
- virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override {}
- virtual void setCursorPalette(const byte *colors, uint start, uint num) override {}
+ bool showMouse(bool visible) override;
+ void warpMouse(int x, int y) override;
+ void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override {}
+ void setCursorPalette(const byte *colors, uint start, uint num) override {}
// SdlGraphicsManager API
- virtual void notifyVideoExpose() override {};
- virtual void notifyResize(const int width, const int height) override;
+ void notifyVideoExpose() override {};
+ void notifyResize(const int width, const int height) override;
- virtual bool gameNeedsAspectRatioCorrection() const override { return false; }
- virtual int getGraphicsModeScale(int mode) const override { return 1; }
+ bool gameNeedsAspectRatioCorrection() const override { return false; }
+ int getGraphicsModeScale(int mode) const override { return 1; }
void transformMouseCoordinates(Common::Point &point);
- virtual bool notifyMousePosition(Common::Point &mouse) override {
+ bool notifyMousePosition(Common::Point &mouse) override {
transformMouseCoordinates(mouse);
return true;
@@ -153,7 +153,7 @@ protected:
Math::Rect2d computeGameRect(bool renderToFrameBuffer, uint gameWidth, uint gameHeight,
uint screenWidth, uint screenHeight);
- virtual bool saveScreenshot(const Common::String &filename) const override;
+ bool saveScreenshot(const Common::String &filename) const override;
uint _engineRequestedWidth, _engineRequestedHeight;
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index 6ebdfad25c..a759db9251 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -54,9 +54,9 @@ public:
/** @name Features */
//@{
- virtual bool hasFeature(Feature f) override;
- virtual void setFeatureState(Feature f, bool enable) override;
- virtual bool getFeatureState(Feature f) override;
+ bool hasFeature(Feature f) override;
+ void setFeatureState(Feature f, bool enable) override;
+ bool getFeatureState(Feature f) override;
//@}
@@ -64,73 +64,73 @@ public:
//@{
GraphicsManager *getGraphicsManager();
- virtual const GraphicsMode *getSupportedGraphicsModes() const override;
- virtual int getDefaultGraphicsMode() const override;
- virtual bool setGraphicsMode(int mode, uint flags = kGfxModeNoFlags) override;
- virtual int getGraphicsMode() const override;
- virtual const GraphicsMode *getSupportedShaders() const override final;
- virtual int getDefaultShader() const override final;
- virtual int getShader() const override final;
- virtual bool setShader(int id) override final;
- virtual const GraphicsMode *getSupportedStretchModes() const override final;
- virtual int getDefaultStretchMode() const override final;
- virtual bool setStretchMode(int mode) override final;
- virtual int getStretchMode() const override final;
- virtual uint getDefaultScaler() const override final;
- virtual uint getDefaultScaleFactor() const override final;
+ const GraphicsMode *getSupportedGraphicsModes() const override;
+ int getDefaultGraphicsMode() const override;
+ bool setGraphicsMode(int mode, uint flags = kGfxModeNoFlags) override;
+ int getGraphicsMode() const override;
+ const GraphicsMode *getSupportedShaders() const override final;
+ int getDefaultShader() const override final;
+ int getShader() const override final;
+ bool setShader(int id) override final;
+ const GraphicsMode *getSupportedStretchModes() const override final;
+ int getDefaultStretchMode() const override final;
+ bool setStretchMode(int mode) override final;
+ int getStretchMode() const override final;
+ uint getDefaultScaler() const override final;
+ uint getDefaultScaleFactor() const override final;
using BaseBackend::setScaler;
- virtual bool setScaler(uint mode, int factor) override final;
- virtual uint getScaler() const override final;
+ bool setScaler(uint mode, int factor) override final;
+ uint getScaler() const override final;
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const override final;
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override final;
+ Graphics::PixelFormat getScreenFormat() const override final;
+ Common::List<Graphics::PixelFormat> getSupportedFormats() const override final;
#endif
- virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL) override final;
- virtual void initSizeHint(const Graphics::ModeList &modes) override final;
- virtual int getScreenChangeID() const override final;
-
- virtual void beginGFXTransaction() override final;
- virtual OSystem::TransactionError endGFXTransaction() override final;
-
- virtual int16 getHeight() override final;
- virtual int16 getWidth() override final;
- virtual PaletteManager *getPaletteManager() override final;
- virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override final;
- virtual Graphics::Surface *lockScreen() override final;
- virtual void unlockScreen() override final;
- virtual void fillScreen(uint32 col) override final;
- virtual void updateScreen() override final;
- virtual void setShakePos(int shakeXOffset, int shakeYOffset) override final;
- virtual void setFocusRectangle(const Common::Rect& rect) override final;
- virtual void clearFocusRectangle() override final;
-
- virtual void showOverlay() override final;
- virtual void hideOverlay() override final;
- virtual bool isOverlayVisible() const override final;
- virtual Graphics::PixelFormat getOverlayFormat() const override final;
- virtual void clearOverlay() override final;
- virtual void grabOverlay(Graphics::Surface &surface) override final;
- virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override final;
- virtual int16 getOverlayHeight() override final;
- virtual int16 getOverlayWidth() override final;
-
- virtual float getHiDPIScreenFactor() const override final;
-
- virtual bool showMouse(bool visible) override final;
- virtual void warpMouse(int x, int y) override final;
- virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override final;
- virtual void setCursorPalette(const byte *colors, uint start, uint num) override final;
- virtual bool lockMouse(bool lock) override final;
+ void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL) override final;
+ void initSizeHint(const Graphics::ModeList &modes) override final;
+ int getScreenChangeID() const override final;
+
+ void beginGFXTransaction() override final;
+ OSystem::TransactionError endGFXTransaction() override final;
+
+ int16 getHeight() override final;
+ int16 getWidth() override final;
+ PaletteManager *getPaletteManager() override final;
+ void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override final;
+ Graphics::Surface *lockScreen() override final;
+ void unlockScreen() override final;
+ void fillScreen(uint32 col) override final;
+ void updateScreen() override final;
+ void setShakePos(int shakeXOffset, int shakeYOffset) override final;
+ void setFocusRectangle(const Common::Rect& rect) override final;
+ void clearFocusRectangle() override final;
+
+ void showOverlay() override final;
+ void hideOverlay() override final;
+ bool isOverlayVisible() const override final;
+ Graphics::PixelFormat getOverlayFormat() const override final;
+ void clearOverlay() override final;
+ void grabOverlay(Graphics::Surface &surface) override final;
+ void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override final;
+ int16 getOverlayHeight() override final;
+ int16 getOverlayWidth() override final;
+
+ float getHiDPIScreenFactor() const override final;
+
+ bool showMouse(bool visible) override final;
+ void warpMouse(int x, int y) override final;
+ void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override final;
+ void setCursorPalette(const byte *colors, uint start, uint num) override final;
+ bool lockMouse(bool lock) override final;
//@}
/** @name Miscellaneous */
//@{
- virtual void displayMessageOnOSD(const Common::U32String &msg) override final;
- virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override final;
+ void displayMessageOnOSD(const Common::U32String &msg) override final;
+ void displayActivityIconOnOSD(const Graphics::Surface *icon) override final;
- virtual void saveScreenshot() override final;
+ void saveScreenshot() override final;
//@}
@@ -152,7 +152,7 @@ public:
//@{
virtual MixerManager *getMixerManager();
- virtual Audio::Mixer *getMixer() override final;
+ Audio::Mixer *getMixer() override final;
//@}
diff --git a/backends/mutex/3ds/3ds-mutex.cpp b/backends/mutex/3ds/3ds-mutex.cpp
index 9ad3244a8f..acd2135480 100644
--- a/backends/mutex/3ds/3ds-mutex.cpp
+++ b/backends/mutex/3ds/3ds-mutex.cpp
@@ -38,10 +38,10 @@
class _3DSMutexInternal final : public Common::MutexInternal {
public:
_3DSMutexInternal() { RecursiveLock_Init(&_mutex); }
- virtual ~_3DSMutexInternal() override {}
+ ~_3DSMutexInternal() override {}
- virtual bool lock() override { RecursiveLock_Lock(&_mutex); return true; }
- virtual bool unlock() override { RecursiveLock_Unlock(&_mutex); return true; }
+ bool lock() override { RecursiveLock_Lock(&_mutex); return true; }
+ bool unlock() override { RecursiveLock_Unlock(&_mutex); return true; }
private:
RecursiveLock _mutex;
diff --git a/backends/mutex/pthread/pthread-mutex.cpp b/backends/mutex/pthread/pthread-mutex.cpp
index 68d874500b..8f4dc925c8 100644
--- a/backends/mutex/pthread/pthread-mutex.cpp
+++ b/backends/mutex/pthread/pthread-mutex.cpp
@@ -36,10 +36,10 @@
class PthreadMutexInternal final : public Common::MutexInternal {
public:
PthreadMutexInternal();
- virtual ~PthreadMutexInternal() override;
+ ~PthreadMutexInternal() override;
- virtual bool lock() override;
- virtual bool unlock() override;
+ bool lock() override;
+ bool unlock() override;
private:
pthread_mutex_t _mutex;
diff --git a/backends/mutex/sdl/sdl-mutex.cpp b/backends/mutex/sdl/sdl-mutex.cpp
index 54b8b5d693..6298eade6e 100644
--- a/backends/mutex/sdl/sdl-mutex.cpp
+++ b/backends/mutex/sdl/sdl-mutex.cpp
@@ -33,10 +33,10 @@
class SdlMutexInternal final : public Common::MutexInternal {
public:
SdlMutexInternal() { _mutex = SDL_CreateMutex(); }
- virtual ~SdlMutexInternal() override { SDL_DestroyMutex(_mutex); }
+ ~SdlMutexInternal() override { SDL_DestroyMutex(_mutex); }
- virtual bool lock() override { return (SDL_mutexP(_mutex) == 0); }
- virtual bool unlock() override { return (SDL_mutexV(_mutex) == 0); }
+ bool lock() override { return (SDL_mutexP(_mutex) == 0); }
+ bool unlock() override { return (SDL_mutexV(_mutex) == 0); }
private:
SDL_mutex *_mutex;
diff --git a/backends/mutex/wii/wii-mutex.cpp b/backends/mutex/wii/wii-mutex.cpp
index e94132f637..a2e223ca8f 100644
--- a/backends/mutex/wii/wii-mutex.cpp
+++ b/backends/mutex/wii/wii-mutex.cpp
@@ -36,10 +36,10 @@
class WiiMutexInternal final : public Common::MutexInternal {
public:
WiiMutexInternal();
- virtual ~WiiMutexInternal() override;
+ ~WiiMutexInternal() override;
- virtual bool lock() override;
- virtual bool unlock() override;
+ bool lock() override;
+ bool unlock() override;
private:
mutex_t _mutex;
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index 825d35716c..91ddfad90e 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -86,11 +86,11 @@ public:
OSystem_Android(int audio_sample_rate, int audio_buffer_size);
virtual ~OSystem_Android();
- virtual void initBackend() override;
+ void initBackend() override;
- virtual bool hasFeature(OSystem::Feature f) override;
- virtual void setFeatureState(OSystem::Feature f, bool enable) override;
- virtual bool getFeatureState(OSystem::Feature f) override;
+ bool hasFeature(OSystem::Feature f) override;
+ void setFeatureState(OSystem::Feature f, bool enable) override;
+ bool getFeatureState(OSystem::Feature f) override;
public:
void pushEvent(int type, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6);
@@ -118,33 +118,33 @@ private:
void pushEvent(const Common::Event &event);
public:
- virtual bool pollEvent(Common::Event &event) override;
- virtual Common::HardwareInputSet *getHardwareInputSet() override;
- virtual Common::KeymapArray getGlobalKeymaps() override;
- virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
-
- virtual void registerDefaultSettings(const Common::String &target) const override;
- virtual GUI::OptionsContainerWidget *buildBackendOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override;
- virtual void applyBackendSettings() override;
-
- virtual uint32 getMillis(bool skipRecord = false) override;
- virtual void delayMillis(uint msecs) override;
- virtual Common::MutexInternal *createMutex() override;
-
- virtual void quit() override;
-
- virtual void setWindowCaption(const Common::U32String &caption) override;
-
- virtual Audio::Mixer *getMixer() override;
- virtual void getTimeAndDate(TimeDate &td, bool skipRecord = false) const override;
- virtual void logMessage(LogMessageType::Type type, const char *message) override;
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
- virtual bool openUrl(const Common::String &url) override;
- virtual bool hasTextInClipboard() override;
- virtual Common::U32String getTextFromClipboard() override;
- virtual bool setTextInClipboard(const Common::U32String &text) override;
- virtual bool isConnectionLimited() override;
- virtual Common::String getSystemLanguage() const override;
+ bool pollEvent(Common::Event &event) override;
+ Common::HardwareInputSet *getHardwareInputSet() override;
+ Common::KeymapArray getGlobalKeymaps() override;
+ Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
+
+ void registerDefaultSettings(const Common::String &target) const override;
+ GUI::OptionsContainerWidget *buildBackendOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override;
+ void applyBackendSettings() override;
+
+ uint32 getMillis(bool skipRecord = false) override;
+ void delayMillis(uint msecs) override;
+ Common::MutexInternal *createMutex() override;
+
+ void quit() override;
+
+ void setWindowCaption(const Common::U32String &caption) override;
+
+ Audio::Mixer *getMixer() override;
+ void getTimeAndDate(TimeDate &td, bool skipRecord = false) const override;
+ void logMessage(LogMessageType::Type type, const char *message) override;
+ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
+ bool openUrl(const Common::String &url) override;
+ bool hasTextInClipboard() override;
+ Common::U32String getTextFromClipboard() override;
+ bool setTextInClipboard(const Common::U32String &text) override;
+ bool isConnectionLimited() override;
+ Common::String getSystemLanguage() const override;
};
#endif
diff --git a/backends/platform/android/asset-archive.h b/backends/platform/android/asset-archive.h
index 125a1b73ac..798b0cb4f3 100644
--- a/backends/platform/android/asset-archive.h
+++ b/backends/platform/android/asset-archive.h
@@ -39,10 +39,10 @@ public:
AndroidAssetArchive(jobject am);
virtual ~AndroidAssetArchive();
- virtual bool hasFile(const Common::Path &path) const override;
- virtual int listMembers(Common::ArchiveMemberList &list) const override;
- virtual const Common::ArchiveMemberPtr getMember(const Common::Path &path) const override;
- virtual Common::SeekableReadStream *createReadStreamForMember(const Common::Path &path) const override;
+ bool hasFile(const Common::Path &path) const override;
+ int listMembers(Common::ArchiveMemberList &list) const override;
+ const Common::ArchiveMemberPtr getMember(const Common::Path &path) const override;
+ Common::SeekableReadStream *createReadStreamForMember(const Common::Path &path) const override;
private:
AAssetManager *_am;
diff --git a/backends/platform/android/graphics.h b/backends/platform/android/graphics.h
index 7d35e98766..37bd3285f8 100644
--- a/backends/platform/android/graphics.h
+++ b/backends/platform/android/graphics.h
@@ -34,23 +34,23 @@ public:
void initSurface();
void deinitSurface();
- virtual void updateScreen() override;
+ void updateScreen() override;
- virtual void displayMessageOnOSD(const Common::U32String &msg) override;
+ void displayMessageOnOSD(const Common::U32String &msg) override;
bool notifyMousePosition(Common::Point &mouse);
Common::Point getMousePosition() { return Common::Point(_cursorX, _cursorY); }
- virtual float getHiDPIScreenFactor() const override;
+ float getHiDPIScreenFactor() const override;
protected:
- virtual void setSystemMousePosition(const int x, const int y) override {}
+ void setSystemMousePosition(const int x, const int y) override {}
- virtual bool loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format) override;
+ bool loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format) override;
- virtual void refreshScreen() override;
+ void refreshScreen() override;
- virtual void *getProcAddress(const char *name) const override;
+ void *getProcAddress(const char *name) const override;
};
diff --git a/backends/platform/android3d/graphics.h b/backends/platform/android3d/graphics.h
index 85d027e5ff..29102b199a 100644
--- a/backends/platform/android3d/graphics.h
+++ b/backends/platform/android3d/graphics.h
@@ -45,36 +45,36 @@ public:
virtual void beginGFXTransaction() {}
virtual OSystem::TransactionError endGFXTransaction() { return OSystem::kTransactionSuccess; }
- virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
- virtual int getDefaultGraphicsMode() const override;
- virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
- virtual int getGraphicsMode() const override;
-
- virtual bool hasFeature(OSystem::Feature f) const override;
- virtual void setFeatureState(OSystem::Feature f, bool enable) override;
- virtual bool getFeatureState(OSystem::Feature f) const override;
-
- virtual void showOverlay() override;
- virtual void hideOverlay() override;
- virtual void clearOverlay() override;
- virtual void grabOverlay(Graphics::Surface &surface) const override;
+ const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
+ int getDefaultGraphicsMode() const override;
+ bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
+ int getGraphicsMode() const override;
+
+ bool hasFeature(OSystem::Feature f) const override;
+ void setFeatureState(OSystem::Feature f, bool enable) override;
+ bool getFeatureState(OSystem::Feature f) const override;
+
+ void showOverlay() override;
+ void hideOverlay() override;
+ void clearOverlay() override;
+ void grabOverlay(Graphics::Surface &surface) const override;
virtual void copyRectToOverlay(const void *buf, int pitch,
int x, int y, int w, int h) override;
- virtual int16 getOverlayHeight() const override;
- virtual int16 getOverlayWidth() const override;
- virtual Graphics::PixelFormat getOverlayFormat() const override;
- virtual bool isOverlayVisible() const override { return _show_overlay; }
+ int16 getOverlayHeight() const override;
+ int16 getOverlayWidth() const override;
+ Graphics::PixelFormat getOverlayFormat() const override;
+ bool isOverlayVisible() const override { return _show_overlay; }
- virtual int16 getHeight() const override;
- virtual int16 getWidth() const override;
+ int16 getHeight() const override;
+ int16 getWidth() const override;
// PaletteManager API
- virtual void setPalette(const byte *colors, uint start, uint num) override;
- virtual void grabPalette(byte *colors, uint start, uint num) const override;
+ void setPalette(const byte *colors, uint start, uint num) override;
+ void grabPalette(byte *colors, uint start, uint num) const override;
virtual void copyRectToScreen(const void *buf, int pitch, int x, int y,
int w, int h) override;
- virtual Graphics::Surface *lockScreen() override;
- virtual void unlockScreen() override;
+ Graphics::Surface *lockScreen() override;
+ void unlockScreen() override;
virtual void fillScreen(uint32 col);
virtual void setShakePos(int shakeXOffset, int shakeYOffset) {};
@@ -83,16 +83,16 @@ public:
virtual void initSize(uint width, uint height,
const Graphics::PixelFormat *format) override;
- virtual int getScreenChangeID() const override;
+ int getScreenChangeID() const override;
- virtual bool showMouse(bool visible) override;
- virtual void warpMouse(int x, int y) override;
- virtual bool lockMouse(bool lock) override;
+ bool showMouse(bool visible) override;
+ void warpMouse(int x, int y) override;
+ bool lockMouse(bool lock) override;
virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX,
int hotspotY, uint32 keycolor,
bool dontScale,
const Graphics::PixelFormat *format) override;
- virtual void setCursorPalette(const byte *colors, uint start, uint num) override;
+ void setCursorPalette(const byte *colors, uint start, uint num) override;
void setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d);
@@ -103,8 +103,8 @@ public:
void clipMouse(Common::Point &p) const;
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const override;
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
+ Graphics::PixelFormat getScreenFormat() const override;
+ Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
#endif
protected:
diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp
index 3c00d641c2..530a38523a 100644
--- a/backends/platform/dc/dc-fs.cpp
+++ b/backends/platform/dc/dc-fs.cpp
@@ -44,21 +44,21 @@ protected:
public:
RoninCDFileNode(const Common::String &path) : _path(path) {}
- virtual bool exists() const override { return true; }
- virtual Common::String getName() const override { return lastPathComponent(_path, '/'); }
- virtual Common::U32String getDisplayName() const override { return getName(); }
- 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 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() override;
- virtual Common::SeekableWriteStream *createWriteStream() override { return 0; }
- virtual bool createDirectory() override { return false; }
+ bool exists() const override { return true; }
+ Common::String getName() const override { return lastPathComponent(_path, '/'); }
+ Common::U32String getDisplayName() const override { return getName(); }
+ Common::String getPath() const override { return _path; }
+ bool isDirectory() const override { return false; }
+ bool isReadable() const override { return true; }
+ bool isWritable() const override { return false; }
+
+ AbstractFSNode *getChild(const Common::String &n) const override { return NULL; }
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override { return false; }
+ AbstractFSNode *getParent() const override;
+
+ Common::SeekableReadStream *createReadStream() override;
+ Common::SeekableWriteStream *createWriteStream() override { return 0; }
+ bool createDirectory() override { return false; }
static AbstractFSNode *makeFileNodePath(const Common::String &path);
};
@@ -68,11 +68,11 @@ class RoninCDDirectoryNode final : public RoninCDFileNode {
public:
RoninCDDirectoryNode(const Common::String &path) : RoninCDFileNode(path) {}
- 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; }
+ bool isDirectory() const override { return true; }
+ AbstractFSNode *getChild(const Common::String &n) const override;
+ bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ Common::SeekableReadStream *createReadStream() override { return 0; }
+ bool createDirectory() override { return true; }
};
/* A file/directory which does not exist */
@@ -80,9 +80,9 @@ class RoninCDNonexistingNode final : public RoninCDFileNode {
public:
RoninCDNonexistingNode(const Common::String &path) : RoninCDFileNode(path) {}
- virtual bool exists() const override { return false; }
- virtual bool isReadable() const override { return false; }
- virtual Common::SeekableReadStream *createReadStream() override { return 0; }
+ bool exists() const override { return false; }
+ bool isReadable() const override { return false; }
+ Common::SeekableReadStream *createReadStream() override { return 0; }
};
AbstractFSNode *RoninCDFileNode::makeFileNodePath(const Common::String &path) {
diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp
index 8ec9926271..3bdfbe0e37 100644
--- a/backends/platform/dc/selector.cpp
+++ b/backends/platform/dc/selector.cpp
@@ -236,10 +236,10 @@ namespace {
class SelectorDiscSwap : public DiscSwap {
using DiscSwap::DiscSwap;
protected:
- virtual void background() override {
+ void background() override {
drawBackground();
}
- virtual void interact() override {
+ void interact() override {
int mousex = 0, mousey = 0;
byte shiftFlags;
diff --git a/backends/platform/ios7/ios7_osys_main.cpp b/backends/platform/ios7/ios7_osys_main.cpp
index 952c8e2563..e9fbcc7a5b 100644
--- a/backends/platform/ios7/ios7_osys_main.cpp
+++ b/backends/platform/ios7/ios7_osys_main.cpp
@@ -68,7 +68,7 @@ public:
: DefaultSaveFileManager(defaultSavepath), _sandboxRootPath(sandboxRootPath) {
}
- virtual bool removeSavefile(const Common::String &filename) override {
+ bool removeSavefile(const Common::String &filename) override {
Common::String chrootedFile = getSavePath() + "/" + filename;
Common::String realFilePath = _sandboxRootPath + chrootedFile;
diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h
index 2e8afc8360..61269086f7 100644
--- a/backends/platform/ios7/ios7_osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -122,94 +122,94 @@ public:
static OSystem_iOS7 *sharedInstance();
- virtual void initBackend() override;
+ void initBackend() override;
- virtual void engineInit() override;
- virtual void engineDone() override;
+ void engineInit() override;
+ void engineDone() override;
- virtual bool hasFeature(Feature f) override;
- virtual void setFeatureState(Feature f, bool enable) override;
- virtual bool getFeatureState(Feature f) override;
- virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format) override;
+ bool hasFeature(Feature f) override;
+ void setFeatureState(Feature f, bool enable) override;
+ bool getFeatureState(Feature f) override;
+ void initSize(uint width, uint height, const Graphics::PixelFormat *format) override;
- virtual void beginGFXTransaction() override;
- virtual TransactionError endGFXTransaction() override;
+ void beginGFXTransaction() override;
+ TransactionError endGFXTransaction() override;
- virtual int16 getHeight() override;
- virtual int16 getWidth() override;
+ int16 getHeight() override;
+ int16 getWidth() override;
bool touchpadModeEnabled() const;
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const override { return _framebuffer.format; }
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
+ Graphics::PixelFormat getScreenFormat() const override { return _framebuffer.format; }
+ Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
#endif
- virtual PaletteManager *getPaletteManager() override { return this; }
+ PaletteManager *getPaletteManager() override { return this; }
- virtual float getHiDPIScreenFactor() const override;
+ float getHiDPIScreenFactor() const override;
protected:
// PaletteManager API
- virtual void setPalette(const byte *colors, uint start, uint num) override;
- virtual void grabPalette(byte *colors, uint start, uint num) const override;
+ void setPalette(const byte *colors, uint start, uint num) override;
+ void grabPalette(byte *colors, uint start, uint num) const override;
public:
- virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override;
- virtual void updateScreen() override;
- virtual Graphics::Surface *lockScreen() override;
- virtual void unlockScreen() override;
- virtual void setShakePos(int shakeXOffset, int shakeYOffset) override;
-
- virtual void showOverlay() override;
- virtual void hideOverlay() override;
- virtual bool isOverlayVisible() const override { return _videoContext->overlayVisible; }
- virtual void clearOverlay() override;
- virtual void grabOverlay(Graphics::Surface &surface) override;
- virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
- virtual int16 getOverlayHeight() override;
- virtual int16 getOverlayWidth() override;
- virtual Graphics::PixelFormat getOverlayFormat() const override;
-
- virtual bool showMouse(bool visible) override;
-
- virtual void warpMouse(int x, int y) override;
- virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 255, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override;
- virtual void setCursorPalette(const byte *colors, uint start, uint num) override;
-
- virtual bool pollEvent(Common::Event &event) override;
- virtual uint32 getMillis(bool skipRecord = false) override;
- virtual void delayMillis(uint msecs) override;
- virtual Common::MutexInternal *createMutex() override;
+ void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override;
+ void updateScreen() override;
+ Graphics::Surface *lockScreen() override;
+ void unlockScreen() override;
+ void setShakePos(int shakeXOffset, int shakeYOffset) override;
+
+ void showOverlay() override;
+ void hideOverlay() override;
+ bool isOverlayVisible() const override { return _videoContext->overlayVisible; }
+ void clearOverlay() override;
+ void grabOverlay(Graphics::Surface &surface) override;
+ void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
+ int16 getOverlayHeight() override;
+ int16 getOverlayWidth() override;
+ Graphics::PixelFormat getOverlayFormat() const override;
+
+ bool showMouse(bool visible) override;
+
+ void warpMouse(int x, int y) override;
+ void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 255, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override;
+ void setCursorPalette(const byte *colors, uint start, uint num) override;
+
+ bool pollEvent(Common::Event &event) override;
+ uint32 getMillis(bool skipRecord = false) override;
+ void delayMillis(uint msecs) override;
+ Common::MutexInternal *createMutex() override;
static void mixCallback(void *sys, byte *samples, int len);
virtual void setupMixer(void);
virtual void setTimerCallback(TimerProc callback, int interval);
- virtual int getScreenChangeID() const override { return _screenChangeCount; }
- virtual void quit() override;
+ int getScreenChangeID() const override { return _screenChangeCount; }
+ void quit() override;
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
- virtual void getTimeAndDate(TimeDate &td, bool skipRecord = false) const override;
+ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
+ void getTimeAndDate(TimeDate &td, bool skipRecord = false) const override;
- virtual Audio::Mixer *getMixer() override;
+ Audio::Mixer *getMixer() override;
void startSoundsystem();
void stopSoundsystem();
- virtual Common::String getDefaultConfigFileName() override;
+ Common::String getDefaultConfigFileName() override;
- virtual void logMessage(LogMessageType::Type type, const char *message) override;
- virtual void fatalError() override;
+ void logMessage(LogMessageType::Type type, const char *message) override;
+ void fatalError() override;
- virtual bool hasTextInClipboard() override;
- virtual Common::U32String getTextFromClipboard() override;
- virtual bool setTextInClipboard(const Common::U32String &text) override;
+ bool hasTextInClipboard() override;
+ Common::U32String getTextFromClipboard() override;
+ bool setTextInClipboard(const Common::U32String &text) override;
- virtual bool openUrl(const Common::String &url) override;
+ bool openUrl(const Common::String &url) override;
- virtual Common::String getSystemLanguage() const override;
+ Common::String getSystemLanguage() const override;
- virtual bool isConnectionLimited() override;
+ bool isConnectionLimited() override;
protected:
void initVideoContext();
diff --git a/backends/platform/maemo/maemo.h b/backends/platform/maemo/maemo.h
index 1902e9e457..f6196bdbe6 100644
--- a/backends/platform/maemo/maemo.h
+++ b/backends/platform/maemo/maemo.h
@@ -36,14 +36,14 @@ public:
OSystem_SDL_Maemo();
~OSystem_SDL_Maemo();
- virtual void init() override;
- virtual void initBackend() override;
- virtual void quit() override;
- virtual void fatalError() override;
- virtual void setWindowCaption(const Common::U32String &caption) override;
- virtual Common::HardwareInputSet *getHardwareInputSet() override;
- virtual Common::KeymapArray getGlobalKeymaps() override;
- virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
+ void init() override;
+ void initBackend() override;
+ void quit() override;
+ void fatalError() override;
+ void setWindowCaption(const Common::U32String &caption) override;
+ Common::HardwareInputSet *getHardwareInputSet() override;
+ Common::KeymapArray getGlobalKeymaps() override;
+ Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
Model getModel() { return _model; }
diff --git a/backends/platform/sdl/macosx/macosx-window.h b/backends/platform/sdl/macosx/macosx-window.h
index c696eae11f..5492a98e81 100644
--- a/backends/platform/sdl/macosx/macosx-window.h
+++ b/backends/platform/sdl/macosx/macosx-window.h
@@ -30,8 +30,8 @@
class SdlWindow_MacOSX final : public SdlWindow {
public:
// Use an iconless window on OS X, as we use a nicer external icon there.
- virtual void setupIcon() override {}
- virtual float getDpiScalingFactor() const override;
+ void setupIcon() override {}
+ float getDpiScalingFactor() const override;
};
#endif
diff --git a/backends/platform/sdl/macosx/macosx.h b/backends/platform/sdl/macosx/macosx.h
index ce3c9acbe4..82595c38f9 100644
--- a/backends/platform/sdl/macosx/macosx.h
+++ b/backends/platform/sdl/macosx/macosx.h
@@ -29,36 +29,36 @@ class OSystem_MacOSX : public OSystem_POSIX {
public:
~OSystem_MacOSX();
- virtual bool hasFeature(Feature f) override;
+ bool hasFeature(Feature f) override;
- virtual bool displayLogFile() override;
+ bool displayLogFile() override;
- virtual bool hasTextInClipboard() override;
- virtual Common::U32String getTextFromClipboard() override;
- virtual bool setTextInClipboard(const Common::U32String &text) override;
+ bool hasTextInClipboard() override;
+ Common::U32String getTextFromClipboard() override;
+ bool setTextInClipboard(const Common::U32String &text) override;
- virtual bool openUrl(const Common::String &url) override;
+ bool openUrl(const Common::String &url) override;
- virtual Common::String getSystemLanguage() const override;
+ Common::String getSystemLanguage() const override;
- virtual void init() override;
- virtual void initBackend() override;
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
+ void init() override;
+ void initBackend() override;
+ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
#ifdef USE_OPENGL
- virtual GraphicsManagerType getDefaultGraphicsManager() const override;
+ GraphicsManagerType getDefaultGraphicsManager() const override;
#endif
//Screenshots
- virtual Common::String getScreenshotsPath() override;
+ Common::String getScreenshotsPath() override;
protected:
- virtual Common::String getDefaultConfigFileName() override;
- virtual Common::String getDefaultLogFileName() override;
+ Common::String getDefaultConfigFileName() override;
+ Common::String getDefaultLogFileName() override;
// Override createAudioCDManager() to get our Mac-specific
// version.
- virtual AudioCDManager *createAudioCDManager() override;
+ AudioCDManager *createAudioCDManager() override;
};
#endif
diff --git a/backends/platform/sdl/morphos/morphos.h b/backends/platform/sdl/morphos/morphos.h
index 28507d0166..3ed5fdcec1 100644
--- a/backends/platform/sdl/morphos/morphos.h
+++ b/backends/platform/sdl/morphos/morphos.h
@@ -27,9 +27,9 @@
class OSystem_MorphOS : public OSystem_SDL {
public:
- virtual void init() override;
+ void init() override;
virtual bool hasFeature(Feature f);
- virtual bool openUrl(const Common::String &url) override;
+ bool openUrl(const Common::String &url) override;
};
#endif
diff --git a/backends/platform/sdl/opendingux/opendingux.h b/backends/platform/sdl/opendingux/opendingux.h
index 5c76fec4ac..b9fb12d860 100644
--- a/backends/platform/sdl/opendingux/opendingux.h
+++ b/backends/platform/sdl/opendingux/opendingux.h
@@ -27,17 +27,17 @@
class OSystem_SDL_Opendingux : public OSystem_SDL {
public:
- virtual void init() override;
- virtual void initBackend() override;
- virtual bool hasFeature(Feature f) override;
- virtual void setFeatureState(Feature f, bool enable) override;
- virtual bool getFeatureState(Feature f) override;
- virtual Common::HardwareInputSet *getHardwareInputSet() override;
- virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
+ void init() override;
+ void initBackend() override;
+ bool hasFeature(Feature f) override;
+ void setFeatureState(Feature f, bool enable) override;
+ bool getFeatureState(Feature f) override;
+ Common::HardwareInputSet *getHardwareInputSet() override;
+ Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
protected:
- virtual Common::String getDefaultConfigFileName() override;
- virtual Common::String getDefaultLogFileName() override;
+ Common::String getDefaultConfigFileName() override;
+ Common::String getDefaultLogFileName() override;
};
#endif
diff --git a/backends/platform/sdl/posix/posix.h b/backends/platform/sdl/posix/posix.h
index f2a00b2922..c2c8be750a 100644
--- a/backends/platform/sdl/posix/posix.h
+++ b/backends/platform/sdl/posix/posix.h
@@ -27,28 +27,28 @@
class OSystem_POSIX : public OSystem_SDL {
public:
- virtual bool hasFeature(Feature f) override;
+ bool hasFeature(Feature f) override;
- virtual bool displayLogFile() override;
+ bool displayLogFile() override;
- virtual void init() override;
- virtual void initBackend() override;
+ void init() override;
+ void initBackend() override;
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
+ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
Common::String getScreenshotsPath() override;
protected:
- virtual Common::String getDefaultConfigFileName() override;
- virtual Common::String getDefaultLogFileName() override;
+ Common::String getDefaultConfigFileName() override;
+ Common::String getDefaultLogFileName() override;
Common::String getXdgUserDir(const char *name);
- virtual AudioCDManager *createAudioCDManager() override;
+ AudioCDManager *createAudioCDManager() override;
#ifdef HAS_POSIX_SPAWN
public:
- virtual bool openUrl(const Common::String &url) override;
+ bool openUrl(const Common::String &url) override;
protected:
bool launchBrowser(const Common::String& client, const Common::String &url);
diff --git a/backends/platform/sdl/psp2/psp2.h b/backends/platform/sdl/psp2/psp2.h
index 72422d8da8..932a960110 100644
--- a/backends/platform/sdl/psp2/psp2.h
+++ b/backends/platform/sdl/psp2/psp2.h
@@ -30,17 +30,17 @@
class OSystem_PSP2 : public OSystem_SDL {
public:
- virtual void init() override;
- virtual void initBackend() override;
- virtual bool hasFeature(Feature f) override;
- virtual void setFeatureState(Feature f, bool enable) override;
- virtual bool getFeatureState(Feature f) override;
- virtual void logMessage(LogMessageType::Type type, const char *message) override;
- virtual Common::HardwareInputSet *getHardwareInputSet() override;
+ void init() override;
+ void initBackend() override;
+ bool hasFeature(Feature f) override;
+ void setFeatureState(Feature f, bool enable) override;
+ bool getFeatureState(Feature f) override;
+ void logMessage(LogMessageType::Type type, const char *message) override;
+ Common::HardwareInputSet *getHardwareInputSet() override;
protected:
- virtual Common::String getDefaultConfigFileName() override;
- virtual Common::String getDefaultLogFileName() override;
+ Common::String getDefaultConfigFileName() override;
+ Common::String getDefaultLogFileName() override;
};
#endif
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index c376591bd6..23f45aa595 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -50,46 +50,46 @@ public:
* instantiating the backend. Early needed managers are
* created here.
*/
- virtual void init() override;
+ void init() override;
- virtual bool hasFeature(Feature f) override;
+ bool hasFeature(Feature f) override;
// Override functions from ModularBackend and OSystem
- virtual void initBackend() override;
- virtual void engineInit() override;
- virtual void engineDone() override;
- virtual void quit() override;
- virtual void fatalError() override;
+ void initBackend() override;
+ void engineInit() override;
+ void engineDone() override;
+ void quit() override;
+ void fatalError() override;
Common::KeymapArray getGlobalKeymaps() override;
Common::HardwareInputSet *getHardwareInputSet() override;
// Logging
- virtual void logMessage(LogMessageType::Type type, const char *message) override;
+ void logMessage(LogMessageType::Type type, const char *message) override;
- virtual Common::String getSystemLanguage() const override;
+ Common::String getSystemLanguage() const override;
#if SDL_VERSION_ATLEAST(2, 0, 0)
// Clipboard
- virtual bool hasTextInClipboard() override;
- virtual Common::U32String getTextFromClipboard() override;
- virtual bool setTextInClipboard(const Common::U32String &text) override;
+ bool hasTextInClipboard() override;
+ Common::U32String getTextFromClipboard() override;
+ bool setTextInClipboard(const Common::U32String &text) override;
- virtual void messageBox(LogMessageType::Type type, const char *message) override;
+ void messageBox(LogMessageType::Type type, const char *message) override;
#endif
#if SDL_VERSION_ATLEAST(2, 0, 14)
- virtual bool openUrl(const Common::String &url) override;
+ bool openUrl(const Common::String &url) override;
#endif
- virtual void setWindowCaption(const Common::U32String &caption) override;
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
- virtual Common::MutexInternal *createMutex() override;
- virtual uint32 getMillis(bool skipRecord = false) override;
- virtual void delayMillis(uint msecs) override;
- virtual void getTimeAndDate(TimeDate &td, bool skipRecord = false) const override;
- virtual MixerManager *getMixerManager() override;
- virtual Common::TimerManager *getTimerManager() override;
- virtual Common::SaveFileManager *getSavefileManager() override;
+ void setWindowCaption(const Common::U32String &caption) override;
+ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
+ Common::MutexInternal *createMutex() override;
+ uint32 getMillis(bool skipRecord = false) override;
+ void delayMillis(uint msecs) override;
+ void getTimeAndDate(TimeDate &td, bool skipRecord = false) const override;
+ MixerManager *getMixerManager() override;
+ Common::TimerManager *getTimerManager() override;
+ Common::SaveFileManager *getSavefileManager() override;
//Screenshots
virtual Common::String getScreenshotsPath();
@@ -177,10 +177,10 @@ protected:
enum GraphicsManagerType { GraphicsManagerSDL, GraphicsManagerOpenGL };
virtual GraphicsManagerType getDefaultGraphicsManager() const { return GraphicsManagerSDL; }
- virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
- virtual int getDefaultGraphicsMode() const override;
- virtual bool setGraphicsMode(int mode, uint flags) override;
- virtual int getGraphicsMode() const override;
+ const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
+ int getDefaultGraphicsMode() const override;
+ bool setGraphicsMode(int mode, uint flags) override;
+ int getGraphicsMode() const override;
#endif
};
diff --git a/backends/platform/sdl/switch/switch.h b/backends/platform/sdl/switch/switch.h
index a4cec06267..fc539abf80 100644
--- a/backends/platform/sdl/switch/switch.h
+++ b/backends/platform/sdl/switch/switch.h
@@ -27,17 +27,17 @@
class OSystem_Switch : public OSystem_SDL {
public:
- virtual void init() override;
- virtual void initBackend() override;
- virtual bool hasFeature(Feature f) override;
- virtual void setFeatureState(Feature f, bool enable) override;
- virtual bool getFeatureState(Feature f) override;
- virtual void logMessage(LogMessageType::Type type, const char *message) override;
- virtual Common::HardwareInputSet *getHardwareInputSet() override;
+ void init() override;
+ void initBackend() override;
+ bool hasFeature(Feature f) override;
+ void setFeatureState(Feature f, bool enable) override;
+ bool getFeatureState(Feature f) override;
+ void logMessage(LogMessageType::Type type, const char *message) override;
+ Common::HardwareInputSet *getHardwareInputSet() override;
virtual Common::String getSystemLanguage() const;
protected:
- virtual Common::String getDefaultLogFileName() override;
+ Common::String getDefaultLogFileName() override;
};
#endif
diff --git a/backends/platform/sdl/win32/win32-window.h b/backends/platform/sdl/win32/win32-window.h
index 0f10f93bd5..2698bf569f 100644
--- a/backends/platform/sdl/win32/win32-window.h
+++ b/backends/platform/sdl/win32/win32-window.h
@@ -29,7 +29,7 @@
class SdlWindow_Win32 final : public SdlWindow {
public:
- virtual void setupIcon() override;
+ void setupIcon() override;
HWND getHwnd();
};
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 4fdacb8019..bb972c8927 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -377,10 +377,10 @@ class Win32ResourceArchive final : public Common::Archive {
public:
Win32ResourceArchive();
- virtual bool hasFile(const Common::Path &path) const override;
- virtual int listMembers(Common::ArchiveMemberList &list) const override;
- virtual const Common::ArchiveMemberPtr getMember(const Common::Path &path) const override;
- virtual Common::SeekableReadStream *createReadStreamForMember(const Common::Path &path) const override;
+ bool hasFile(const Common::Path &path) const override;
+ int listMembers(Common::ArchiveMemberList &list) const override;
+ const Common::ArchiveMemberPtr getMember(const Common::Path &path) const override;
+ Common::SeekableReadStream *createReadStreamForMember(const Common::Path &path) const override;
private:
typedef Common::List<Common::String> FilenameList;
diff --git a/backends/platform/sdl/win32/win32.h b/backends/platform/sdl/win32/win32.h
index c26d285da7..76d2fcdb66 100644
--- a/backends/platform/sdl/win32/win32.h
+++ b/backends/platform/sdl/win32/win32.h
@@ -30,34 +30,34 @@ class OSystem_Win32 final : public OSystem_SDL {
public:
OSystem_Win32();
- virtual void init() override;
- virtual void initBackend() override;
+ void init() override;
+ void initBackend() override;
#ifdef USE_OPENGL
- virtual GraphicsManagerType getDefaultGraphicsManager() const override;
+ GraphicsManagerType getDefaultGraphicsManager() const override;
#endif
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
+ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
- virtual bool hasFeature(Feature f) override;
+ bool hasFeature(Feature f) override;
- virtual bool displayLogFile() override;
+ bool displayLogFile() override;
- virtual bool openUrl(const Common::String &url) override;
+ bool openUrl(const Common::String &url) override;
- virtual void logMessage(LogMessageType::Type type, const char *message) override;
+ void logMessage(LogMessageType::Type type, const char *message) override;
- virtual Common::String getSystemLanguage() const override;
+ Common::String getSystemLanguage() const override;
- virtual Common::String getScreenshotsPath() override;
+ Common::String getScreenshotsPath() override;
protected:
- virtual Common::String getDefaultConfigFileName() override;
- virtual Common::String getDefaultLogFileName() override;
+ Common::String getDefaultConfigFileName() override;
+ Common::String getDefaultLogFileName() override;
// Override createAudioCDManager() to get our Windows-specific
// version.
- virtual AudioCDManager *createAudioCDManager() override;
+ AudioCDManager *createAudioCDManager() override;
HWND getHwnd() { return ((SdlWindow_Win32*)_window)->getHwnd(); }
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 7b56134c43..3385853dce 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -32,10 +32,10 @@ public:
OSystem_SDL_Symbian();
// Override from OSystem_SDL
- virtual void init() override;
- virtual void initBackend() override;
- virtual Common::String getDefaultConfigFileName() override;
- virtual bool hasFeature(Feature f) override;
+ void init() override;
+ void initBackend() override;
+ Common::String getDefaultConfigFileName() override;
+ bool hasFeature(Feature f) override;
void quitWithErrorMsg(const char *msg);
@@ -43,7 +43,7 @@ public:
Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
- virtual bool openUrl(const Common::String &url) override;
+ bool openUrl(const Common::String &url) override;
protected:
TFileName _localpath;
};
diff --git a/backends/platform/wii/options.h b/backends/platform/wii/options.h
index d83729a49a..af0a8d0021 100644
--- a/backends/platform/wii/options.h
+++ b/backends/platform/wii/options.h
@@ -40,8 +40,8 @@ public:
virtual ~WiiOptionsDialog();
protected:
- virtual void handleTickle() override;
- virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;
+ void handleTickle() override;
+ void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;
private:
bool _doubleStrike;
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index 8d49cf342b..85dd8430e5 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -141,76 +141,76 @@ public:
OSystem_Wii();
virtual ~OSystem_Wii();
- virtual void initBackend() override;
- virtual void engineInit() override;
- virtual void engineDone() override;
-
- virtual bool hasFeature(Feature f) override;
- virtual void setFeatureState(Feature f, bool enable) override;
- virtual bool getFeatureState(Feature f) override;
- virtual const GraphicsMode *getSupportedGraphicsModes() const override;
- virtual int getDefaultGraphicsMode() const override;
- virtual bool setGraphicsMode(int mode, uint flags = kGfxModeNoFlags) override;
+ void initBackend() override;
+ void engineInit() override;
+ void engineDone() override;
+
+ bool hasFeature(Feature f) override;
+ void setFeatureState(Feature f, bool enable) override;
+ bool getFeatureState(Feature f) override;
+ const GraphicsMode *getSupportedGraphicsModes() const override;
+ int getDefaultGraphicsMode() const override;
+ bool setGraphicsMode(int mode, uint flags = kGfxModeNoFlags) override;
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const override;
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
+ Graphics::PixelFormat getScreenFormat() const override;
+ Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
#endif
- virtual int getGraphicsMode() const override;
+ int getGraphicsMode() const override;
virtual void initSize(uint width, uint height,
const Graphics::PixelFormat *format) override;
- virtual int16 getWidth() override;
- virtual int16 getHeight() override;
+ int16 getWidth() override;
+ int16 getHeight() override;
- virtual PaletteManager *getPaletteManager() override { return this; }
+ PaletteManager *getPaletteManager() override { return this; }
protected:
- virtual void setPalette(const byte *colors, uint start, uint num) override;
- virtual void grabPalette(byte *colors, uint start, uint num) const override;
+ void setPalette(const byte *colors, uint start, uint num) override;
+ void grabPalette(byte *colors, uint start, uint num) const override;
public:
- virtual void setCursorPalette(const byte *colors, uint start, uint num) override;
+ void setCursorPalette(const byte *colors, uint start, uint num) override;
virtual void copyRectToScreen(const void *buf, int pitch, int x, int y,
int w, int h) override;
- virtual void updateScreen() override;
- virtual Graphics::Surface *lockScreen() override;
- virtual void unlockScreen() override;
- virtual void setShakePos(int shakeXOffset, int shakeYOffset) override;
-
- virtual void showOverlay() override;
- virtual void hideOverlay() override;
- virtual bool isOverlayVisible() const override { return _overlayVisible; }
- virtual void clearOverlay() override;
- virtual void grabOverlay(Graphics::Surface &surface) override;
+ void updateScreen() override;
+ Graphics::Surface *lockScreen() override;
+ void unlockScreen() override;
+ void setShakePos(int shakeXOffset, int shakeYOffset) override;
+
+ void showOverlay() override;
+ void hideOverlay() override;
+ bool isOverlayVisible() const override { return _overlayVisible; }
+ void clearOverlay() override;
+ void grabOverlay(Graphics::Surface &surface) override;
virtual void copyRectToOverlay(const void *buf, int pitch,
int x, int y, int w, int h) override;
- virtual int16 getOverlayWidth() override;
- virtual int16 getOverlayHeight() override;
- virtual Graphics::PixelFormat getOverlayFormat() const override;
+ int16 getOverlayWidth() override;
+ int16 getOverlayHeight() override;
+ Graphics::PixelFormat getOverlayFormat() const override;
- virtual bool showMouse(bool visible) override;
+ bool showMouse(bool visible) override;
- virtual void warpMouse(int x, int y) override;
+ void warpMouse(int x, int y) override;
virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX,
int hotspotY, uint32 keycolor,
bool dontScale,
const Graphics::PixelFormat *format) override;
- virtual bool pollEvent(Common::Event &event) override;
- virtual uint32 getMillis(bool skipRecord = false) override;
- virtual void delayMillis(uint msecs) override;
+ bool pollEvent(Common::Event &event) override;
+ uint32 getMillis(bool skipRecord = false) override;
+ void delayMillis(uint msecs) override;
- virtual Common::MutexInternal *createMutex() override;
+ Common::MutexInternal *createMutex() override;
typedef void (*SoundProc)(void *param, byte *buf, int len);
- virtual void quit() override;
+ void quit() override;
- virtual Audio::Mixer *getMixer() override;
- virtual FilesystemFactory *getFilesystemFactory() override;
- virtual void getTimeAndDate(TimeDate &td, bool skipRecord = false) const override;
+ Audio::Mixer *getMixer() override;
+ FilesystemFactory *getFilesystemFactory() override;
+ void getTimeAndDate(TimeDate &td, bool skipRecord = false) const override;
- virtual void logMessage(LogMessageType::Type type, const char *message) override;
+ void logMessage(LogMessageType::Type type, const char *message) override;
#ifndef GAMECUBE
- virtual Common::String getSystemLanguage() const override;
+ Common::String getSystemLanguage() const override;
#endif // GAMECUBE
};
diff --git a/backends/plugins/wii/wii-provider.cpp b/backends/plugins/wii/wii-provider.cpp
index d0beb245f7..38e9975365 100644
--- a/backends/plugins/wii/wii-provider.cpp
+++ b/backends/plugins/wii/wii-provider.cpp
@@ -32,7 +32,7 @@
class WiiDLObject final : public PPCDLObject {
protected:
- virtual void flushDataCache(void *ptr, uint32 len) const override {
+ void flushDataCache(void *ptr, uint32 len) const override {
DCFlushRange(ptr, len);
ICInvalidateRange(ptr, len);
}
diff --git a/backends/plugins/win32/win32-provider.cpp b/backends/plugins/win32/win32-provider.cpp
index 9fdb52c901..d3b0168073 100644
--- a/backends/plugins/win32/win32-provider.cpp
+++ b/backends/plugins/win32/win32-provider.cpp
@@ -41,7 +41,7 @@ class Win32Plugin final : public DynamicPlugin {
protected:
void *_dlHandle;
- virtual VoidFunc findSymbol(const char *symbol) override {
+ VoidFunc findSymbol(const char *symbol) override {
FARPROC func = GetProcAddress((HMODULE)_dlHandle, symbol);
if (!func)
debug("Failed loading symbol '%s' from plugin '%s'", symbol, _filename.c_str());
@@ -53,7 +53,7 @@ public:
Win32Plugin(const Common::String &filename)
: DynamicPlugin(filename), _dlHandle(0) {}
- virtual bool loadPlugin() override {
+ bool loadPlugin() override {
assert(!_dlHandle);
TCHAR *tFilename = Win32::stringToTchar(_filename);
_dlHandle = LoadLibrary(tFilename);
@@ -69,7 +69,7 @@ public:
return DynamicPlugin::loadPlugin();
}
- virtual void unloadPlugin() override {
+ void unloadPlugin() override {
DynamicPlugin::unloadPlugin();
if (_dlHandle) {
if (!FreeLibrary((HMODULE)_dlHandle))
diff --git a/backends/taskbar/win32/win32-taskbar.h b/backends/taskbar/win32/win32-taskbar.h
index 18e78b099e..aa02d8a4b4 100644
--- a/backends/taskbar/win32/win32-taskbar.h
+++ b/backends/taskbar/win32/win32-taskbar.h
@@ -36,13 +36,13 @@ public:
Win32TaskbarManager(SdlWindow_Win32 *window);
virtual ~Win32TaskbarManager();
- virtual void setOverlayIcon(const Common::String &name, const Common::String &description) override;
- virtual void setProgressValue(int completed, int total) override;
- virtual void setProgressState(TaskbarProgressState state) override;
- virtual void setCount(int count) override;
- virtual void addRecent(const Common::String &name, const Common::String &description) override;
- virtual void notifyError() override;
- virtual void clearError() override;
+ void setOverlayIcon(const Common::String &name, const Common::String &description) override;
+ void setProgressValue(int completed, int total) override;
+ void setProgressState(TaskbarProgressState state) override;
+ void setCount(int count) override;
+ void addRecent(const Common::String &name, const Common::String &description) override;
+ void notifyError() override;
+ void clearError() override;
private:
SdlWindow_Win32 *_window;
diff --git a/backends/text-to-speech/linux/linux-text-to-speech.h b/backends/text-to-speech/linux/linux-text-to-speech.h
index 069229f0e7..f2a05bcb5a 100644
--- a/backends/text-to-speech/linux/linux-text-to-speech.h
+++ b/backends/text-to-speech/linux/linux-text-to-speech.h
@@ -58,31 +58,31 @@ public:
};
SpeechDispatcherManager();
- virtual ~SpeechDispatcherManager() override;
+ ~SpeechDispatcherManager() override;
- virtual bool say(const Common::U32String &str, Action action) override;
+ bool say(const Common::U32String &str, Action action) override;
- virtual bool stop() override;
- virtual bool pause() override;
- virtual bool resume() override;
+ bool stop() override;
+ bool pause() override;
+ bool resume() override;
- virtual bool isSpeaking() override;
- virtual bool isPaused() override;
- virtual bool isReady() override;
+ bool isSpeaking() override;
+ bool isPaused() override;
+ bool isReady() override;
- virtual void setVoice(unsigned index) override;
- virtual void setRate(int rate) override;
- virtual void setPitch(int pitch) override;
- virtual void setVolume(unsigned volume) override;
- virtual void setLanguage(Common::String language) override;
+ void setVoice(unsigned index) override;
+ void setRate(int rate) override;
+ void setPitch(int pitch) override;
+ void setVolume(unsigned volume) override;
+ void setLanguage(Common::String language) override;
void updateState(SpeechEvent event);
- virtual void freeVoiceData(void *data) override;
+ void freeVoiceData(void *data) override;
private:
void init();
- virtual void updateVoices() override;
+ void updateVoices() override;
void createVoice(int typeNumber, Common::TTSVoice::Gender, Common::TTSVoice::Age, char *description);
Common::String strToUtf8(Common::String str, Common::String charset);
static void *startSpeech(void *p);
diff --git a/backends/text-to-speech/macosx/macosx-text-to-speech.h b/backends/text-to-speech/macosx/macosx-text-to-speech.h
index b13e146406..02c5757d68 100644
--- a/backends/text-to-speech/macosx/macosx-text-to-speech.h
+++ b/backends/text-to-speech/macosx/macosx-text-to-speech.h
@@ -34,36 +34,36 @@
class MacOSXTextToSpeechManager : public Common::TextToSpeechManager {
public:
MacOSXTextToSpeechManager();
- virtual ~MacOSXTextToSpeechManager() override;
+ ~MacOSXTextToSpeechManager() override;
- virtual bool say(const Common::U32String &str, Action action) override;
+ bool say(const Common::U32String &str, Action action) override;
- virtual bool stop() override;
- virtual bool pause() override;
- virtual bool resume() override;
+ bool stop() override;
+ bool pause() override;
+ bool resume() override;
- virtual bool isSpeaking() override;
- virtual bool isPaused() override;
- virtual bool isReady() override;
+ bool isSpeaking() override;
+ bool isPaused() override;
+ bool isReady() override;
- virtual void setVoice(unsigned index) override;
+ void setVoice(unsigned index) override;
- virtual void setRate(int rate) override;
+ void setRate(int rate) override;
- virtual void setPitch(int pitch) override;
+ void setPitch(int pitch) override;
- virtual void setVolume(unsigned volume) override;
+ void setVolume(unsigned volume) override;
- virtual void setLanguage(Common::String language) override;
+ void setLanguage(Common::String language) override;
- virtual int getDefaultVoice() override;
+ int getDefaultVoice() override;
- virtual void freeVoiceData(void *data) override;
+ void freeVoiceData(void *data) override;
bool startNextSpeech();
private:
- virtual void updateVoices() override;
+ void updateVoices() override;
Common::Queue<Common::String> _messageQueue;
Common::String _currentSpeech;
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.h b/backends/text-to-speech/windows/windows-text-to-speech.h
index 8584bc330e..cb72826276 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.h
+++ b/backends/text-to-speech/windows/windows-text-to-speech.h
@@ -50,33 +50,33 @@ public:
};
WindowsTextToSpeechManager();
- virtual ~WindowsTextToSpeechManager() override;
+ ~WindowsTextToSpeechManager() override;
- virtual bool say(const Common::U32String &str, Action action) override;
+ bool say(const Common::U32String &str, Action action) override;
- virtual bool stop() override;
- virtual bool pause() override;
- virtual bool resume() override;
+ bool stop() override;
+ bool pause() override;
+ bool resume() override;
- virtual bool isSpeaking() override;
- virtual bool isPaused() override;
- virtual bool isReady() override;
+ bool isSpeaking() override;
+ bool isPaused() override;
+ bool isReady() override;
- virtual void setVoice(unsigned index) override;
+ void setVoice(unsigned index) override;
- virtual void setRate(int rate) override;
+ void setRate(int rate) override;
- virtual void setPitch(int pitch) override;
+ void setPitch(int pitch) override;
- virtual void setVolume(unsigned volume) override;
+ void setVolume(unsigned volume) override;
- virtual void setLanguage(Common::String language) override;
+ void setLanguage(Common::String language) override;
- virtual void freeVoiceData(void *data) override;
+ void freeVoiceData(void *data) override;
private:
void init();
- virtual void updateVoices() override;
+ void updateVoices() override;
void createVoice(void *cpVoiceToken);
Common::String lcidToLocale(LCID locale);
SpeechState _speechState;
diff --git a/backends/updates/win32/win32-updates.h b/backends/updates/win32/win32-updates.h
index 9d04a36e29..f0c176a074 100644
--- a/backends/updates/win32/win32-updates.h
+++ b/backends/updates/win32/win32-updates.h
@@ -36,15 +36,15 @@ public:
Win32UpdateManager(SdlWindow_Win32 *window);
virtual ~Win32UpdateManager();
- virtual void checkForUpdates() override;
+ void checkForUpdates() override;
- virtual void setAutomaticallyChecksForUpdates(UpdateState state) override;
- virtual UpdateState getAutomaticallyChecksForUpdates() override;
+ void setAutomaticallyChecksForUpdates(UpdateState state) override;
+ UpdateState getAutomaticallyChecksForUpdates() override;
- virtual void setUpdateCheckInterval(int interval) override;
- virtual int getUpdateCheckInterval() override;
+ void setUpdateCheckInterval(int interval) override;
+ int getUpdateCheckInterval() override;
- virtual bool getLastUpdateCheckTimeAndDate(TimeDate &t) override;
+ bool getLastUpdateCheckTimeAndDate(TimeDate &t) override;
private:
static int canShutdownCallback();
diff --git a/base/plugins.h b/base/plugins.h
index b454c75f96..687fdf1d7e 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -379,18 +379,18 @@ protected:
bool loadPluginByFileName(const Common::String &filename);
public:
- virtual void init() override;
- virtual void loadFirstPlugin() override;
- virtual bool loadNextPlugin() override;
- virtual bool loadPluginFromEngineId(const Common::String &engineId) override;
- virtual void updateConfigWithFileName(const Common::String &engineId) override;
+ void init() override;
+ void loadFirstPlugin() override;
+ bool loadNextPlugin() override;
+ bool loadPluginFromEngineId(const Common::String &engineId) override;
+ void updateConfigWithFileName(const Common::String &engineId) override;
#ifndef DETECTION_STATIC
- virtual void loadDetectionPlugin() override;
- virtual void unloadDetectionPlugin() override;
+ void loadDetectionPlugin() override;
+ void unloadDetectionPlugin() override;
#endif
- virtual void loadAllPlugins() override {} // we don't allow these
- virtual void loadAllPluginsOfType(PluginType type) override {}
+ void loadAllPlugins() override {} // we don't allow these
+ void loadAllPluginsOfType(PluginType type) override {}
};
#endif
More information about the Scummvm-git-logs
mailing list