[Scummvm-git-logs] scummvm master -> 8c90d4e4986a09620d8e9aa5b2ebd44eec00d201
ccawley2011
ccawley2011 at gmail.com
Wed Oct 14 16:48:43 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b6a8fc5dd2 ANDROID: Minor cleanup
8c90d4e498 ANDROID: Add override keywords
Commit: b6a8fc5dd281d8b4d6b6b55dc2d8eedf9bfaa467
https://github.com/scummvm/scummvm/commit/b6a8fc5dd281d8b4d6b6b55dc2d8eedf9bfaa467
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-14T17:47:22+01:00
Commit Message:
ANDROID: Minor cleanup
Changed paths:
backends/platform/android/android.cpp
backends/platform/android/android.h
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 07f7cfeefc..37757bf4ae 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -470,7 +470,7 @@ void OSystem_Android::setFeatureState(Feature f, bool enable) {
switch (f) {
case kFeatureVirtualKeyboard:
_virtkeybd_on = enable;
- showVirtualKeyboard(enable);
+ JNI::showVirtualKeyboard(enable);
break;
case kFeatureTouchpadMode:
ConfMan.setBool("touchpad_mouse_mode", enable);
@@ -569,12 +569,6 @@ void OSystem_Android::setWindowCaption(const char *caption) {
JNI::setWindowCaption(caption);
}
-void OSystem_Android::showVirtualKeyboard(bool enable) {
- ENTER("%d", enable);
-
- JNI::showVirtualKeyboard(enable);
-}
-
Audio::Mixer *OSystem_Android::getMixer() {
assert(_mixer);
return _mixer;
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index bb4671b669..185137bfa4 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -111,11 +111,9 @@ private:
int _joystick_scale;
int _fingersDown;
- void clipMouse(Common::Point &p);
- void scaleMouse(Common::Point &p, int x, int y, bool deductDrawRect = true, bool touchpadMode = false);
+ void pushEvent(const Common::Event &event);
public:
- virtual void pushEvent(const Common::Event &event);
virtual bool pollEvent(Common::Event &event);
virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings();
@@ -125,7 +123,6 @@ public:
virtual void quit();
virtual void setWindowCaption(const char *caption);
- virtual void showVirtualKeyboard(bool enable);
virtual Audio::Mixer *getMixer();
virtual void getTimeAndDate(TimeDate &t) const;
Commit: 8c90d4e4986a09620d8e9aa5b2ebd44eec00d201
https://github.com/scummvm/scummvm/commit/8c90d4e4986a09620d8e9aa5b2ebd44eec00d201
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-14T17:48:29+01:00
Commit Message:
ANDROID: Add override keywords
Changed paths:
backends/mutex/pthread/pthread-mutex.h
backends/platform/android/android.h
backends/platform/android/asset-archive.h
backends/platform/android/graphics.h
diff --git a/backends/mutex/pthread/pthread-mutex.h b/backends/mutex/pthread/pthread-mutex.h
index b3a73b2968..fdb3d72fcf 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 185137bfa4..fcd6a89f9a 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 uint32 getMillis(bool skipRecord = false);
- virtual void delayMillis(uint msecs);
-
- virtual void quit();
-
- virtual void setWindowCaption(const char *caption);
-
- 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 bool pollEvent(Common::Event &event) override;
+ virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
+
+ virtual uint32 getMillis(bool skipRecord = false) override;
+ virtual void delayMillis(uint msecs) override;
+
+ virtual void quit() override;
+
+ virtual void setWindowCaption(const char *caption) override;
+
+ 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 8ae55b22c9..98871f47c9 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 b8fefad175..dcfe880111 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;
};
More information about the Scummvm-git-logs
mailing list