From 8c90d4e4986a09620d8e9aa5b2ebd44eec00d201 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Wed, 14 Oct 2020 17:48:29 +0100 Subject: [PATCH] ANDROID: Add override keywords --- backends/mutex/pthread/pthread-mutex.h | 8 ++--- backends/platform/android/android.h | 42 +++++++++++------------ backends/platform/android/asset-archive.h | 8 ++--- backends/platform/android/graphics.h | 12 +++---- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/backends/mutex/pthread/pthread-mutex.h b/backends/mutex/pthread/pthread-mutex.h index b3a73b2968e..fdb3d72fcfe 100644 --- a/backends/mutex/pthread/pthread-mutex.h +++ b/backends/mutex/pthread/pthread-mutex.h @@ -30,10 +30,10 @@ */ class PthreadMutexManager : public MutexManager { public: - virtual OSystem::MutexRef createMutex(); - virtual void lockMutex(OSystem::MutexRef mutex); - virtual void unlockMutex(OSystem::MutexRef mutex); - virtual void deleteMutex(OSystem::MutexRef mutex); + virtual OSystem::MutexRef createMutex() override; + virtual void lockMutex(OSystem::MutexRef mutex) override; + virtual void unlockMutex(OSystem::MutexRef mutex) override; + virtual void deleteMutex(OSystem::MutexRef mutex) override; }; diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index 185137bfa41..fcd6a89f9af 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(); + virtual void initBackend() override; - virtual bool hasFeature(OSystem::Feature f); - virtual void setFeatureState(OSystem::Feature f, bool enable); - virtual bool getFeatureState(OSystem::Feature f); + virtual bool hasFeature(OSystem::Feature f) override; + virtual void setFeatureState(OSystem::Feature f, bool enable) override; + virtual bool getFeatureState(OSystem::Feature f) override; public: void pushEvent(int type, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6); @@ -114,27 +114,27 @@ private: void pushEvent(const Common::Event &event); public: - virtual bool pollEvent(Common::Event &event); - virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings(); + virtual bool pollEvent(Common::Event &event) override; + virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override; - virtual uint32 getMillis(bool skipRecord = false); - virtual void delayMillis(uint msecs); + virtual uint32 getMillis(bool skipRecord = false) override; + virtual void delayMillis(uint msecs) override; - 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 void getTimeAndDate(TimeDate &t) const; - virtual void logMessage(LogMessageType::Type type, const char *message); - virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); - virtual bool openUrl(const Common::String &url); - virtual bool hasTextInClipboard(); - virtual Common::U32String getTextFromClipboard(); - virtual bool setTextInClipboard(const Common::U32String &text); - virtual bool isConnectionLimited(); - virtual Common::String getSystemLanguage() const; - virtual char *convertEncoding(const char *to, const char *from, const char *string, size_t length); + virtual Audio::Mixer *getMixer() override; + virtual void getTimeAndDate(TimeDate &t) 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; + virtual char *convertEncoding(const char *to, const char *from, const char *string, size_t length) override; }; #endif diff --git a/backends/platform/android/asset-archive.h b/backends/platform/android/asset-archive.h index 8ae55b22c99..98871f47c97 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::String &name) const; - virtual int listMembers(Common::ArchiveMemberList &list) const; - virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const; - virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; + virtual bool hasFile(const Common::String &name) const override; + virtual int listMembers(Common::ArchiveMemberList &list) const override; + virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const override; + virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override; private: AAssetManager *_am; diff --git a/backends/platform/android/graphics.h b/backends/platform/android/graphics.h index b8fefad1758..dcfe8801118 100644 --- a/backends/platform/android/graphics.h +++ b/backends/platform/android/graphics.h @@ -34,21 +34,21 @@ public: void initSurface(); void deinitSurface(); - void updateScreen(); + virtual void updateScreen() override; - void displayMessageOnOSD(const Common::U32String &msg); + virtual void displayMessageOnOSD(const Common::U32String &msg) override; bool notifyMousePosition(Common::Point &mouse); Common::Point getMousePosition() { return Common::Point(_cursorX, _cursorY); } protected: - void setSystemMousePosition(int x, int y) {} + virtual void setSystemMousePosition(const int x, const int y) override {} - bool loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format); + virtual bool loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format) override; - void refreshScreen(); + virtual void refreshScreen() override; - void *getProcAddress(const char *name) const; + virtual void *getProcAddress(const char *name) const override; };