[Scummvm-git-logs] scummvm branch-2-2 -> 6c9a00584990969004925172680bdb4e1db7e8d4

[antoniou79]

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:
6c9a005849 ANDROID: Minor cleanup


Commit: 6c9a00584990969004925172680bdb4e1db7e8d4
    https://github.com/scummvm/scummvm/commit/6c9a00584990969004925172680bdb4e1db7e8d4
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-15T13:43:25+03: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 a3229a6537..5546d49501 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 c5c887e163..5b5f3f128f 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -110,11 +110,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();
 
@@ -124,7 +122,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;