ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: Add override keywords

Browse Source
This commit is contained in:
Cameron Cawley
2020-10-14 17:48:29 +01:00
parent b6a8fc5dd2
commit 8c90d4e498
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backends/mutex/pthread/pthread-mutex.h
+4 -4
View File
@@ -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;
};
backends/platform/android/android.h
+21 -21
View File
@@ -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
backends/platform/android/asset-archive.h
+4 -4
View File
@@ -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;
backends/platform/android/graphics.h
+6 -6
View File
@@ -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;
};