[Scummvm-git-logs] scummvm master -> 70aebaca5b81d0d83c2bb8c6c14dc2a535e3d4b1
ccawley2011
ccawley2011 at gmail.com
Fri Oct 16 16:47:08 UTC 2020
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:
70aebaca5b WII: Add override and final keywords
Commit: 70aebaca5b81d0d83c2bb8c6c14dc2a535e3d4b1
https://github.com/scummvm/scummvm/commit/70aebaca5b81d0d83c2bb8c6c14dc2a535e3d4b1
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-16T17:46:43+01:00
Commit Message:
WII: Add override and final keywords
Changed paths:
backends/fs/wii/wii-fs-factory.h
backends/fs/wii/wii-fs.h
backends/platform/wii/options.h
backends/platform/wii/osystem.h
backends/platform/wii/osystem_gfx.cpp
backends/plugins/wii/wii-provider.cpp
backends/plugins/wii/wii-provider.h
diff --git a/backends/fs/wii/wii-fs-factory.h b/backends/fs/wii/wii-fs-factory.h
index 913c0a3b64..06bc7d4ded 100644
--- a/backends/fs/wii/wii-fs-factory.h
+++ b/backends/fs/wii/wii-fs-factory.h
@@ -34,7 +34,7 @@
*
* Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class WiiFilesystemFactory : public FilesystemFactory, public Common::Singleton<WiiFilesystemFactory> {
+class WiiFilesystemFactory final : public FilesystemFactory, public Common::Singleton<WiiFilesystemFactory> {
public:
typedef Common::String String;
@@ -43,9 +43,9 @@ public:
kSMB
};
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const override;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const override;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const override;
void asyncInit();
void asyncDeinit();
diff --git a/backends/fs/wii/wii-fs.h b/backends/fs/wii/wii-fs.h
index 7c04ee53ec..2bd45cdbba 100644
--- a/backends/fs/wii/wii-fs.h
+++ b/backends/fs/wii/wii-fs.h
@@ -30,7 +30,7 @@
*
* Parts of this class are documented in the base interface class, AbstractFSNode.
*/
-class WiiFilesystemNode : public AbstractFSNode {
+class WiiFilesystemNode final : public AbstractFSNode {
protected:
Common::String _displayName;
Common::String _path;
@@ -55,21 +55,21 @@ public:
WiiFilesystemNode(const Common::String &p);
WiiFilesystemNode(const Common::String &p, const struct stat *st);
- virtual bool exists() const;
- virtual Common::String getDisplayName() const { return _displayName; }
- virtual Common::String getName() const { return _displayName; }
- virtual Common::String getPath() const { return _path; }
- virtual bool isDirectory() const { return _isDirectory; }
- virtual bool isReadable() const { return _isReadable; }
- virtual bool isWritable() const { return _isWritable; }
+ virtual bool exists() const override;
+ virtual Common::String getDisplayName() const override { return _displayName; }
+ virtual Common::String getName() const override { return _displayName; }
+ virtual Common::String getPath() const override { return _path; }
+ virtual bool isDirectory() const override { return _isDirectory; }
+ virtual bool isReadable() const override { return _isReadable; }
+ virtual bool isWritable() const override { return _isWritable; }
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
+ virtual AbstractFSNode *getChild(const Common::String &n) const override;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
+ virtual AbstractFSNode *getParent() const override;
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::WriteStream *createWriteStream();
- virtual bool createDirectory();
+ virtual Common::SeekableReadStream *createReadStream() override;
+ virtual Common::WriteStream *createWriteStream() override;
+ virtual bool createDirectory() override;
};
#endif
diff --git a/backends/platform/wii/options.h b/backends/platform/wii/options.h
index 0128050304..d83729a49a 100644
--- a/backends/platform/wii/options.h
+++ b/backends/platform/wii/options.h
@@ -31,7 +31,7 @@
using namespace GUI;
-class WiiOptionsDialog: public GUI::Dialog {
+class WiiOptionsDialog final : public GUI::Dialog {
typedef Common::String String;
typedef Common::U32String U32String;
@@ -40,8 +40,8 @@ public:
virtual ~WiiOptionsDialog();
protected:
- virtual void handleTickle();
- virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+ virtual void handleTickle() override;
+ virtual 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 350a3f45a0..da8108fc57 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -52,7 +52,7 @@ extern void wii_memstats(void);
}
#endif
-class OSystem_Wii : public EventsBaseBackend, public PaletteManager {
+class OSystem_Wii final : public EventsBaseBackend, public PaletteManager {
private:
s64 _startup_time;
@@ -141,81 +141,81 @@ public:
OSystem_Wii();
virtual ~OSystem_Wii();
- virtual void initBackend();
- virtual void engineInit();
- virtual void engineDone();
+ virtual void initBackend() override;
+ virtual void engineInit() override;
+ virtual void engineDone() override;
- virtual bool hasFeature(Feature f);
- virtual void setFeatureState(Feature f, bool enable);
- virtual bool getFeatureState(Feature f);
- virtual const GraphicsMode *getSupportedGraphicsModes() const;
- virtual int getDefaultGraphicsMode() const;
- virtual bool setGraphicsMode(int mode);
+ 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;
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const;
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
+ virtual Graphics::PixelFormat getScreenFormat() const override;
+ virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
#endif
- virtual int getGraphicsMode() const;
+ virtual int getGraphicsMode() const override;
virtual void initSize(uint width, uint height,
- const Graphics::PixelFormat *format);
- virtual int16 getWidth();
- virtual int16 getHeight();
+ const Graphics::PixelFormat *format) override;
+ virtual int16 getWidth() override;
+ virtual int16 getHeight() override;
- virtual PaletteManager *getPaletteManager() { return this; }
+ virtual PaletteManager *getPaletteManager() override { return this; }
protected:
- virtual void setPalette(const byte *colors, uint start, uint num);
- virtual void grabPalette(byte *colors, uint start, uint num) const;
+ virtual void setPalette(const byte *colors, uint start, uint num) override;
+ virtual void grabPalette(byte *colors, uint start, uint num) const override;
public:
- virtual void setCursorPalette(const byte *colors, uint start, uint num);
+ virtual 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);
- virtual void updateScreen();
- virtual Graphics::Surface *lockScreen();
- virtual void unlockScreen();
- virtual void setShakePos(int shakeXOffset, int shakeYOffset);
-
- virtual void showOverlay();
- virtual void hideOverlay();
- virtual bool isOverlayVisible() const { return _overlayVisible; }
- virtual void clearOverlay();
- virtual void grabOverlay(void *buf, int pitch);
+ 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(void *buf, int pitch) override;
virtual void copyRectToOverlay(const void *buf, int pitch,
- int x, int y, int w, int h);
- virtual int16 getOverlayWidth();
- virtual int16 getOverlayHeight();
- virtual Graphics::PixelFormat getOverlayFormat() const;
+ int x, int y, int w, int h) override;
+ virtual int16 getOverlayWidth() override;
+ virtual int16 getOverlayHeight() override;
+ virtual Graphics::PixelFormat getOverlayFormat() const override;
- virtual bool showMouse(bool visible);
+ virtual bool showMouse(bool visible) override;
- virtual void warpMouse(int x, int y);
+ 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,
- const Graphics::PixelFormat *format);
+ const Graphics::PixelFormat *format) override;
- virtual bool pollEvent(Common::Event &event);
- virtual uint32 getMillis(bool skipRecord = false);
- virtual void delayMillis(uint msecs);
+ virtual bool pollEvent(Common::Event &event) override;
+ virtual uint32 getMillis(bool skipRecord = false) override;
+ virtual void delayMillis(uint msecs) override;
- virtual MutexRef createMutex();
- virtual void lockMutex(MutexRef mutex);
- virtual void unlockMutex(MutexRef mutex);
- virtual void deleteMutex(MutexRef mutex);
+ virtual MutexRef createMutex() override;
+ virtual void lockMutex(MutexRef mutex) override;
+ virtual void unlockMutex(MutexRef mutex) override;
+ virtual void deleteMutex(MutexRef mutex) override;
typedef void (*SoundProc)(void *param, byte *buf, int len);
- virtual void quit();
+ virtual void quit() override;
- virtual void setWindowCaption(const char *caption);
+ virtual void setWindowCaption(const char *caption) override;
- virtual Audio::Mixer *getMixer();
- virtual FilesystemFactory *getFilesystemFactory();
- virtual void getTimeAndDate(TimeDate &t) const;
+ virtual Audio::Mixer *getMixer() override;
+ virtual FilesystemFactory *getFilesystemFactory() override;
+ virtual void getTimeAndDate(TimeDate &t) const override;
- virtual void logMessage(LogMessageType::Type type, const char *message);
+ virtual void logMessage(LogMessageType::Type type, const char *message) override;
#ifndef GAMECUBE
- virtual Common::String getSystemLanguage() const;
+ virtual Common::String getSystemLanguage() const override;
#endif // GAMECUBE
};
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 6a7adce3dd..709ddc0bf8 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -198,7 +198,7 @@ int OSystem_Wii::getDefaultGraphicsMode() const {
return gmStandard;
}
-bool OSystem_Wii::setGraphicsMode(int mode) {
+bool OSystem_Wii::setGraphicsMode(int mode, uint flags) {
_configGraphicsMode = mode;
return true;
}
diff --git a/backends/plugins/wii/wii-provider.cpp b/backends/plugins/wii/wii-provider.cpp
index 4d7391b44e..d0beb245f7 100644
--- a/backends/plugins/wii/wii-provider.cpp
+++ b/backends/plugins/wii/wii-provider.cpp
@@ -30,9 +30,9 @@
#include "backends/plugins/wii/wii-provider.h"
#include "backends/plugins/elf/ppc-loader.h"
-class WiiDLObject : public PPCDLObject {
+class WiiDLObject final : public PPCDLObject {
protected:
- virtual void flushDataCache(void *ptr, uint32 len) const {
+ virtual void flushDataCache(void *ptr, uint32 len) const override {
DCFlushRange(ptr, len);
ICInvalidateRange(ptr, len);
}
diff --git a/backends/plugins/wii/wii-provider.h b/backends/plugins/wii/wii-provider.h
index 49eba82e8b..eb45ebe907 100644
--- a/backends/plugins/wii/wii-provider.h
+++ b/backends/plugins/wii/wii-provider.h
@@ -27,9 +27,9 @@
#include "backends/plugins/elf/elf-provider.h"
-class WiiPluginProvider : public ELFPluginProvider {
+class WiiPluginProvider final : public ELFPluginProvider {
public:
- Plugin *createPlugin(const Common::FSNode &node) const;
+ Plugin *createPlugin(const Common::FSNode &node) const override;
};
#endif // BACKENDS_PLUGINS_WII_PROVIDER_H
More information about the Scummvm-git-logs
mailing list