aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2018-03-28 11:58:35 +0200
committerEugene Sandulenko2018-03-28 11:58:35 +0200
commitd6b5e3f611c315b2d5dca01f58c92a8b53ebc32b (patch)
treeea7c22e9a1bdc3a0b1887b3b733bab55529b30d7
parent880081aa2c475c0a8e7cf67a7cdbe6f53d05d1f4 (diff)
downloadscummvm-rg350-d6b5e3f611c315b2d5dca01f58c92a8b53ebc32b.tar.gz
scummvm-rg350-d6b5e3f611c315b2d5dca01f58c92a8b53ebc32b.tar.bz2
scummvm-rg350-d6b5e3f611c315b2d5dca01f58c92a8b53ebc32b.zip
BAKCENDS: Mark methods as override
-rw-r--r--backends/events/default/default-events.h20
-rw-r--r--backends/graphics/windowed.h2
-rw-r--r--backends/modular-backend.h104
3 files changed, 63 insertions, 63 deletions
diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h
index df6ebd2f14..9a85fca52a 100644
--- a/backends/events/default/default-events.h
+++ b/backends/events/default/default-events.h
@@ -49,7 +49,7 @@ class DefaultEventManager : public Common::EventManager, Common::EventObserver {
Common::ArtificialEventSource _artificialEventSource;
Common::Queue<Common::Event> _eventQueue;
- bool notifyEvent(const Common::Event &ev) {
+ bool notifyEvent(const Common::Event &ev) override {
_eventQueue.push(ev);
return true;
}
@@ -76,17 +76,17 @@ public:
DefaultEventManager(Common::EventSource *boss);
~DefaultEventManager();
- virtual void init();
- virtual bool pollEvent(Common::Event &event);
- virtual void pushEvent(const Common::Event &event);
+ virtual void init() override;
+ virtual bool pollEvent(Common::Event &event) override;
+ virtual void pushEvent(const Common::Event &event) override;
virtual void purgeMouseEvents() override;
- virtual Common::Point getMousePos() const { return _mousePos; }
- virtual int getButtonState() const { return _buttonState; }
- virtual int getModifierState() const { return _modifierState; }
- virtual int shouldQuit() const { return _shouldQuit; }
- virtual int shouldRTL() const { return _shouldRTL; }
- virtual void resetRTL() { _shouldRTL = false; }
+ 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 shouldRTL() const override { return _shouldRTL; }
+ virtual void resetRTL() override { _shouldRTL = false; }
#ifdef FORCE_RTL
virtual void resetQuit() { _shouldQuit = false; }
#endif
diff --git a/backends/graphics/windowed.h b/backends/graphics/windowed.h
index 5f89d2d233..8a0bddf5be 100644
--- a/backends/graphics/windowed.h
+++ b/backends/graphics/windowed.h
@@ -201,7 +201,7 @@ protected:
* @param x The new X position of the mouse in virtual screen coordinates.
* @param y The new Y position of the mouse in virtual screen coordinates.
*/
- void warpMouse(const int x, const int y) {
+ void warpMouse(const int x, const int y) override {
// Check active coordinate instead of window coordinate to avoid warping
// the mouse if it is still within the same virtual pixel
const Common::Point virtualCursor = convertWindowToVirtual(_cursorX, _cursorY);
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index 982dbbfb02..fa34f2921f 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -52,9 +52,9 @@ public:
/** @name Features */
//@{
- virtual bool hasFeature(Feature f);
- virtual void setFeatureState(Feature f, bool enable);
- virtual bool getFeatureState(Feature f);
+ virtual bool hasFeature(Feature f) override;
+ virtual void setFeatureState(Feature f, bool enable) override;
+ virtual bool getFeatureState(Feature f) override;
//@}
@@ -62,76 +62,76 @@ public:
//@{
virtual GraphicsManager *getGraphicsManager();
- virtual const GraphicsMode *getSupportedGraphicsModes() const;
- virtual int getDefaultGraphicsMode() const;
- virtual bool setGraphicsMode(int mode);
- virtual int getGraphicsMode() const;
- virtual const GraphicsMode *getSupportedShaders() const;
- virtual int getShader() const;
- virtual bool setShader(int id);
- virtual void resetGraphicsScale();
+ virtual const GraphicsMode *getSupportedGraphicsModes() const override;
+ virtual int getDefaultGraphicsMode() const override;
+ virtual bool setGraphicsMode(int mode) override;
+ virtual int getGraphicsMode() const override;
+ virtual const GraphicsMode *getSupportedShaders() const override;
+ virtual int getShader() const override;
+ virtual bool setShader(int id) override;
+ virtual void resetGraphicsScale() 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 void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL);
+ virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL) override;
virtual void initSizeHint(const Graphics::ModeList &modes) override;
- virtual int getScreenChangeID() const;
-
- virtual void beginGFXTransaction();
- virtual OSystem::TransactionError endGFXTransaction();
-
- virtual int16 getHeight();
- virtual int16 getWidth();
- virtual PaletteManager *getPaletteManager();
- virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h);
- virtual Graphics::Surface *lockScreen();
- virtual void unlockScreen();
- virtual void fillScreen(uint32 col);
- virtual void updateScreen();
- virtual void setShakePos(int shakeOffset);
- virtual void setFocusRectangle(const Common::Rect& rect);
- virtual void clearFocusRectangle();
-
- virtual void showOverlay();
- virtual void hideOverlay();
- virtual Graphics::PixelFormat getOverlayFormat() const;
- virtual void clearOverlay();
- virtual void grabOverlay(void *buf, int pitch);
- virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h);
- virtual int16 getOverlayHeight();
- virtual int16 getOverlayWidth();
-
- virtual bool showMouse(bool visible);
- virtual void warpMouse(int x, int y);
- virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL);
- virtual void setCursorPalette(const byte *colors, uint start, uint num);
+ virtual int getScreenChangeID() const override;
+
+ virtual void beginGFXTransaction() override;
+ virtual OSystem::TransactionError endGFXTransaction() override;
+
+ virtual int16 getHeight() override;
+ virtual int16 getWidth() override;
+ virtual PaletteManager *getPaletteManager() 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;
+ virtual void fillScreen(uint32 col) override;
+ virtual void updateScreen() override;
+ virtual void setShakePos(int shakeOffset) override;
+ virtual void setFocusRectangle(const Common::Rect& rect) override;
+ virtual void clearFocusRectangle() override;
+
+ virtual void showOverlay() override;
+ virtual void hideOverlay() override;
+ virtual Graphics::PixelFormat getOverlayFormat() const override;
+ 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) override;
+ virtual int16 getOverlayHeight() override;
+ virtual int16 getOverlayWidth() 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, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override;
+ virtual void setCursorPalette(const byte *colors, uint start, uint num) override;
//@}
/** @name Mutex handling */
//@{
- 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;
//@}
/** @name Sound */
//@{
- virtual Audio::Mixer *getMixer();
+ virtual Audio::Mixer *getMixer() override;
//@}
/** @name Miscellaneous */
//@{
- virtual void quit();
- virtual void displayMessageOnOSD(const char *msg);
- virtual void displayActivityIconOnOSD(const Graphics::Surface *icon);
+ virtual void quit() override;
+ virtual void displayMessageOnOSD(const char *msg) override;
+ virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override;
//@}