[Scummvm-git-logs] scummvm master -> ee18a89df5fbe6ff702e94401803ebc380576e91

ccawley2011 ccawley2011 at gmail.com
Sun Nov 1 20:05:20 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:
ee18a89df5 MAEMO: Add override and final keywords


Commit: ee18a89df5fbe6ff702e94401803ebc380576e91
    https://github.com/scummvm/scummvm/commit/ee18a89df5fbe6ff702e94401803ebc380576e91
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-11-01T20:04:57Z

Commit Message:
MAEMO: Add override and final keywords

Changed paths:
    backends/events/maemosdl/maemosdl-events.h
    backends/graphics/maemosdl/maemosdl-graphics.h
    backends/platform/maemo/maemo.h


diff --git a/backends/events/maemosdl/maemosdl-events.h b/backends/events/maemosdl/maemosdl-events.h
index d2df05ad89..c3a9e4cace 100644
--- a/backends/events/maemosdl/maemosdl-events.h
+++ b/backends/events/maemosdl/maemosdl-events.h
@@ -32,24 +32,24 @@ namespace Maemo {
 /**
  * SDL events manager for Maemo
  */
-class MaemoSdlEventSource : public SdlEventSource {
+class MaemoSdlEventSource final : public SdlEventSource {
 public:
 	MaemoSdlEventSource();
 
 	bool toggleClickMode();
 protected:
-	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
-	virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
-	virtual bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
+	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 _clickEnabled;
 };
 
-class MaemoSdlEventObserver : public Common::EventObserver {
+class MaemoSdlEventObserver final : public Common::EventObserver {
 public:
 	MaemoSdlEventObserver(MaemoSdlEventSource *eventSource);
 
-	virtual bool notifyEvent(const Common::Event &event);
+	virtual bool notifyEvent(const Common::Event &event) override;
 private:
 	MaemoSdlEventSource *_eventSource;
 };
diff --git a/backends/graphics/maemosdl/maemosdl-graphics.h b/backends/graphics/maemosdl/maemosdl-graphics.h
index ff4278b48c..6fe766eb67 100644
--- a/backends/graphics/maemosdl/maemosdl-graphics.h
+++ b/backends/graphics/maemosdl/maemosdl-graphics.h
@@ -27,7 +27,7 @@
 
 #include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
 
-class MaemoSdlGraphicsManager : public SurfaceSdlGraphicsManager {
+class MaemoSdlGraphicsManager final : public SurfaceSdlGraphicsManager {
 public:
 	MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
 
diff --git a/backends/platform/maemo/maemo.h b/backends/platform/maemo/maemo.h
index 91ca084357..b3080de0c4 100644
--- a/backends/platform/maemo/maemo.h
+++ b/backends/platform/maemo/maemo.h
@@ -31,19 +31,19 @@
 namespace Maemo {
 class MaemoSdlEventObserver;
 
-class OSystem_SDL_Maemo : public OSystem_POSIX {
+class OSystem_SDL_Maemo final : public OSystem_POSIX {
 public:
 	OSystem_SDL_Maemo();
 	~OSystem_SDL_Maemo();
 
-	virtual void init();
-	virtual void initBackend();
-	virtual void quit();
-	virtual void fatalError();
-	virtual void setWindowCaption(const char *caption);
-	virtual Common::HardwareInputSet *getHardwareInputSet();
-	Common::KeymapArray getGlobalKeymaps() override;
-	Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
+	virtual void init() override;
+	virtual void initBackend() override;
+	virtual void quit() override;
+	virtual void fatalError() override;
+	virtual void setWindowCaption(const char *caption) override;
+	virtual Common::HardwareInputSet *getHardwareInputSet() override;
+	virtual Common::KeymapArray getGlobalKeymaps() override;
+	virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
 
 	Model getModel() { return _model; }
 




More information about the Scummvm-git-logs mailing list