ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8972 from Ebola16/CT 

Android: Some simple Clang-Tidy suggestions
This commit is contained in:
LC 2020-07-22 16:24:05 -04:00 committed by GitHub
parent 92d24aec2e 9ac24a0580
commit 8e99c77510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/jni/GameList/GameFile.cpp
View File

@ -188,7 +188,7 @@ JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_getBan
jobject obj) jobject obj)
{ {
const std::vector<u32>& buffer = GetRef(env, obj)->GetBannerImage().buffer; const std::vector<u32>& buffer = GetRef(env, obj)->GetBannerImage().buffer;
const jsize size = static_cast<jsize>(buffer.size()); const auto size = static_cast<jsize>(buffer.size());
const jintArray out_array = env->NewIntArray(size); const jintArray out_array = env->NewIntArray(size);
if (!out_array) if (!out_array)
return nullptr; return nullptr;

2
Source/Android/jni/GameList/GameFileCache.cpp
View File

@ -89,7 +89,7 @@ JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_up
for (jsize i = 0; i < size; ++i) for (jsize i = 0; i < size; ++i)
{ {
const jstring path = reinterpret_cast<jstring>(env->GetObjectArrayElement(folder_paths, i)); const auto path = reinterpret_cast<jstring>(env->GetObjectArrayElement(folder_paths, i));
folder_paths_vector.push_back(GetJString(env, path)); folder_paths_vector.push_back(GetJString(env, path));
env->DeleteLocalRef(path); env->DeleteLocalRef(path);
} }

23
Source/Android/jni/MainAndroid.cpp
View File

@ -63,7 +63,7 @@
namespace namespace
{ {
static constexpr char DOLPHIN_TAG[] = "DolphinEmuNative"; constexpr char DOLPHIN_TAG[] = "DolphinEmuNative";
ANativeWindow* s_surf; ANativeWindow* s_surf;
IniFile s_ini; IniFile s_ini;
@ -157,7 +157,7 @@ static bool MsgAlert(const char* caption, const char* text, bool yes_no, Common:
return result != JNI_FALSE; return result != JNI_FALSE;
} }
static void ReportSend(std::string endpoint, std::string report) static void ReportSend(const std::string& endpoint, const std::string& report)
{ {
JNIEnv* env = IDCache::GetEnvForThread(); JNIEnv* env = IDCache::GetEnvForThread();
@ -169,11 +169,11 @@ static void ReportSend(std::string endpoint, std::string report)
ToJString(env, endpoint), output_array); ToJString(env, endpoint), output_array);
} }
static std::string GetAnalyticValue(std::string key) static std::string GetAnalyticValue(const std::string& key)
{ {
JNIEnv* env = IDCache::GetEnvForThread(); JNIEnv* env = IDCache::GetEnvForThread();
jstring value = reinterpret_cast<jstring>(env->CallStaticObjectMethod( auto value = reinterpret_cast<jstring>(env->CallStaticObjectMethod(
IDCache::GetAnalyticsClass(), IDCache::GetAnalyticsValue(), ToJString(env, key))); IDCache::GetAnalyticsClass(), IDCache::GetAnalyticsValue(), ToJString(env, key)));
std::string stdvalue = GetJString(env, value); std::string stdvalue = GetJString(env, value);
@ -329,13 +329,13 @@ JNIEXPORT double JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetInputRa
JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv* env, JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv* env,
jobject obj) jobject obj)
{ {
return ToJString(env, Common::scm_rev_str.c_str()); return ToJString(env, Common::scm_rev_str);
} }
JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGitRevision(JNIEnv* env, JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGitRevision(JNIEnv* env,
jobject obj) jobject obj)
{ {
return ToJString(env, Common::scm_rev_git_str.c_str()); return ToJString(env, Common::scm_rev_git_str);
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv* env, JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv* env,
@ -372,12 +372,12 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserSe
std::string section = GetJString(env, jSection); std::string section = GetJString(env, jSection);
std::string key = GetJString(env, jKey); std::string key = GetJString(env, jKey);
ini = SConfig::GetInstance().LoadGameIni(gameid, 0); ini = SConfig::LoadGameIni(gameid, 0);
std::string value; std::string value;
ini.GetOrCreateSection(section)->Get(key, &value, "-1"); ini.GetOrCreateSection(section)->Get(key, &value, "-1");
return ToJString(env, value.c_str()); return ToJString(env, value);
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_NewGameIniFile(JNIEnv* env, JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_NewGameIniFile(JNIEnv* env,
@ -457,7 +457,7 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig
ini.GetOrCreateSection(section)->Get(key, &value, defaultValue); ini.GetOrCreateSection(section)->Get(key, &value, defaultValue);
return ToJString(env, value.c_str()); return ToJString(env, value);
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig( JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig(
@ -533,7 +533,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirec
JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserDirectory(JNIEnv* env, JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserDirectory(JNIEnv* env,
jobject obj) jobject obj)
{ {
return ToJString(env, File::GetUserPath(D_USER_IDX).c_str()); return ToJString(env, File::GetUserPath(D_USER_IDX));
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetCacheDirectory( JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetCacheDirectory(
@ -683,7 +683,8 @@ static float GetRenderSurfaceScale(JNIEnv* env)
} }
static void Run(JNIEnv* env, const std::vector<std::string>& paths, static void Run(JNIEnv* env, const std::vector<std::string>& paths,
std::optional<std::string> savestate_path = {}, bool delete_savestate = false) const std::optional<std::string>& savestate_path = {},
bool delete_savestate = false)
{ {
ASSERT(!paths.empty()); ASSERT(!paths.empty());
__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", paths[0].c_str()); __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", paths[0].c_str());