diff options
| author | LC <mathew1800@gmail.com> | 2020-11-09 02:15:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 02:15:04 -0500 |
| commit | 418f9faa9dd55572d9ecdd206d689b41b7b47544 (patch) | |
| tree | 9b15ce30e556f42691b5cb1bc2043667e219aa11 /Source/Android/jni/NativeConfig.cpp | |
| parent | 766fab2561db0f571a2af80541e26e6ecbfca2d2 (diff) | |
| parent | e4793cfb39677adc698fbfab8d4c7d6f9eb18737 (diff) | |
Merge pull request #9228 from JosJuice/android-jclass
Android: Fix jobject/jclass warnings
Diffstat (limited to 'Source/Android/jni/NativeConfig.cpp')
| -rw-r--r-- | Source/Android/jni/NativeConfig.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/Source/Android/jni/NativeConfig.cpp b/Source/Android/jni/NativeConfig.cpp index 636514a3ed..ef4c847ee2 100644 --- a/Source/Android/jni/NativeConfig.cpp +++ b/Source/Android/jni/NativeConfig.cpp @@ -95,7 +95,7 @@ extern "C" { JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_isSettingSaveable( - JNIEnv* env, jclass obj, jstring file, jstring section, jstring key) + JNIEnv* env, jclass, jstring file, jstring section, jstring key) { const Config::Location location = GetLocation(env, file, section, key); return static_cast<jboolean>(ConfigLoaders::IsSettingSaveable(location)); @@ -103,7 +103,7 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_isSettingSav JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_loadGameInis(JNIEnv* env, - jclass obj, + jclass, jstring jGameId, jint jRevision) { @@ -114,22 +114,21 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_loadGameInis } JNIEXPORT void JNICALL -Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_unloadGameInis(JNIEnv* env, - jclass obj) +Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_unloadGameInis(JNIEnv*, jclass) { Config::RemoveLayer(Config::LayerType::GlobalGame); Config::RemoveLayer(Config::LayerType::LocalGame); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_save( - JNIEnv* env, jclass obj, jint layer) + JNIEnv*, jclass, jint layer) { return GetLayer(layer, {})->Save(); } JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_isOverridden( - JNIEnv* env, jclass obj, jstring file, jstring section, jstring key) + JNIEnv* env, jclass, jstring file, jstring section, jstring key) { const Config::Location location = GetLocation(env, file, section, key); const bool result = Config::GetActiveLayerForConfig(location) != Config::LayerType::Base; @@ -138,7 +137,7 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_isOverridden JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_deleteKey( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key) + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key) { const Config::Location location = GetLocation(env, file, section, key); return static_cast<jboolean>(GetLayer(layer, location)->DeleteKey(location)); @@ -146,7 +145,7 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_deleteKey( JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_getString( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key, + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jstring default_value) { const Config::Location location = GetLocation(env, file, section, key); @@ -155,7 +154,7 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_getString( JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_getBoolean( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key, + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jboolean default_value) { const Config::Location location = GetLocation(env, file, section, key); @@ -163,15 +162,14 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_getBoolean( } JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_getInt( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key, - jint default_value) + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jint default_value) { return Get(layer, GetLocation(env, file, section, key), default_value); } JNIEXPORT jfloat JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_getFloat( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key, + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jfloat default_value) { return Get(layer, GetLocation(env, file, section, key), default_value); @@ -179,26 +177,26 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_getFloat( JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setString( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key, jstring value) + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jstring value) { return Set(layer, GetLocation(env, file, section, key), GetJString(env, value)); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setBoolean( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key, jboolean value) + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jboolean value) { return Set(layer, GetLocation(env, file, section, key), static_cast<bool>(value)); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setInt( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key, jint value) + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jint value) { return Set(layer, GetLocation(env, file, section, key), value); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setFloat( - JNIEnv* env, jclass obj, jint layer, jstring file, jstring section, jstring key, jfloat value) + JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jfloat value) { return Set(layer, GetLocation(env, file, section, key), value); } |
