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

[ccawley2011]

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:
c502fd2162 BACKENDS: Remove unused functions


Commit: c502fd216276d1561c850221b62615f7f1f92b6a
    https://github.com/scummvm/scummvm/commit/c502fd216276d1561c850221b62615f7f1f92b6a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-08-31T21:37:41+01:00

Commit Message:
BACKENDS: Remove unused functions

Changed paths:
    backends/platform/android/jni-android.cpp
    backends/platform/android/jni-android.h
    backends/platform/sdl/win32/win32_wrapper.cpp
    backends/platform/sdl/win32/win32_wrapper.h


diff --git a/backends/platform/android/jni-android.cpp b/backends/platform/android/jni-android.cpp
index 301bfe237a..f9bbb6f880 100644
--- a/backends/platform/android/jni-android.cpp
+++ b/backends/platform/android/jni-android.cpp
@@ -728,15 +728,6 @@ void JNI::setPause(JNIEnv *env, jobject self, jboolean value) {
 	}
 }
 
-Common::String JNI::getCurrentCharset() {
-#ifdef USE_TRANSLATION
-	if (TransMan.getCurrentCharset() != "ASCII") {
-		return TransMan.getCurrentCharset();
-	}
-#endif
-	return "ISO-8859-1";
-}
-
 jstring JNI::convertToJString(JNIEnv *env, const Common::String &str, const Common::String &from) {
 	Common::Encoding converter("UTF-8", from.c_str());
 	char *utf8Str = converter.convert(str.c_str(), converter.stringLength(str.c_str(), from));
diff --git a/backends/platform/android/jni-android.h b/backends/platform/android/jni-android.h
index a861c2aa15..a54ba3acf9 100644
--- a/backends/platform/android/jni-android.h
+++ b/backends/platform/android/jni-android.h
@@ -142,8 +142,6 @@ private:
 							int arg2, int arg3, int arg4, int arg5, int arg6);
 	static void setPause(JNIEnv *env, jobject self, jboolean value);
 
-	static Common::String getCurrentCharset();
-
 	static jstring convertToJString(JNIEnv *env, const Common::String &str, const Common::String &from);
 	static Common::String convertFromJString(JNIEnv *env, const jstring &jstr, const Common::String &to);
 
diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp
index 7c7357a4d7..0ac9d07705 100644
--- a/backends/platform/sdl/win32/win32_wrapper.cpp
+++ b/backends/platform/sdl/win32/win32_wrapper.cpp
@@ -117,19 +117,4 @@ wchar_t *UTF8ToUnicode(const char *s) {
 	return NULL;
 }
 
-uint getCurrentCharset() {
-#ifdef USE_TRANSLATION
-	Common::String charset = TransMan.getCurrentCharset();
-	if (charset == "iso-8859-2")
-		return 28592;
-	if (charset == "iso-8859-5")
-		return 28595;
-	if (charset == "iso-8859-7")
-		return 28597;
-	if (charset == "iso-8859-8")
-		return 28598;
-#endif
-	return 28591;
-}
-
 }
diff --git a/backends/platform/sdl/win32/win32_wrapper.h b/backends/platform/sdl/win32/win32_wrapper.h
index aa7831d835..0b46cae648 100644
--- a/backends/platform/sdl/win32/win32_wrapper.h
+++ b/backends/platform/sdl/win32/win32_wrapper.h
@@ -72,8 +72,6 @@ char *unicodeToAnsi(const wchar_t *s, uint codePage = CP_ACP);
  */
 wchar_t *UTF8ToUnicode(const char *s);
 
-uint getCurrentCharset();
-
 }
 
 #endif