Merge pull request #9228 from JosJuice/android-jclass

Android: Fix jobject/jclass warnings
dolphin-emu · Nov 9, 2020 · 418f9fa · 418f9fa
2 parents 766fab2 + e4793cf
commit 418f9fa
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 110 deletions.
diff --git a/Source/Android/jni/AndroidCommon/IDCache.h b/Source/Android/jni/AndroidCommon/IDCache.h
@@ -8,8 +8,6 @@
 
 namespace IDCache
 {
-static constexpr jint JNI_VERSION = JNI_VERSION_1_6;
-
 JNIEnv* GetEnvForThread();
 
 jclass GetNativeLibraryClass();

diff --git a/Source/Android/jni/GameList/GameFile.cpp b/Source/Android/jni/GameList/GameFile.cpp
@@ -187,8 +187,7 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_getBannerHe
   return static_cast<jint>(GetRef(env, obj)->GetBannerImage().height);
 }
 
-JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_parse(JNIEnv* env,
-                                                                              jobject obj,
+JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_parse(JNIEnv* env, jclass,
                                                                               jstring path)
 {
   auto game_file = std::make_shared<UICommon::GameFile>(GetJString(env, path));

diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_newGameFileCache(
-    JNIEnv* env, jobject obj, jstring path)
+    JNIEnv* env, jclass, jstring path)
 {
   return reinterpret_cast<jlong>(new UICommon::GameFileCache(GetJString(env, path)));
 }

diff --git a/Source/Android/jni/IniFile.cpp b/Source/Android/jni/IniFile.cpp
@@ -232,13 +232,13 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_utils_IniFile_finalize(JNI
 }
 
 JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_utils_IniFile_newIniFile(JNIEnv* env,
-                                                                                jobject obj)
+                                                                                jobject)
 {
   return reinterpret_cast<jlong>(new IniFile);
 }
 
 JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_utils_IniFile_copyIniFile(JNIEnv* env,
-                                                                                 jobject obj,
+                                                                                 jobject,
                                                                                  jobject other)
 {
   return reinterpret_cast<jlong>(new IniFile(*GetIniFilePointer(env, other)));