From c89828b22ecdf5b8e36741ced7bad9bd2af54076 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 6 Jul 2020 17:02:01 +0200 Subject: Android: Convert some files to LF I wonder why lint didn't catch this... --- Source/Android/jni/AndroidCommon/AndroidCommon.cpp | 78 +++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'Source/Android/jni/AndroidCommon/AndroidCommon.cpp') diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp index 04e34c0f21..cb7b9ff073 100644 --- a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp +++ b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp @@ -1,39 +1,39 @@ -// Copyright 2018 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#include "jni/AndroidCommon/AndroidCommon.h" - -#include -#include - -#include - -std::string GetJString(JNIEnv* env, jstring jstr) -{ - std::string result = ""; - if (!jstr) - return result; - - const char* s = env->GetStringUTFChars(jstr, nullptr); - result = s; - env->ReleaseStringUTFChars(jstr, s); - return result; -} - -jstring ToJString(JNIEnv* env, const std::string& str) -{ - return env->NewStringUTF(str.c_str()); -} - -std::vector JStringArrayToVector(JNIEnv* env, jobjectArray array) -{ - const jsize size = env->GetArrayLength(array); - std::vector result; - result.reserve(size); - - for (jsize i = 0; i < size; ++i) - result.push_back(GetJString(env, (jstring)env->GetObjectArrayElement(array, i))); - - return result; -} +// Copyright 2018 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#include "jni/AndroidCommon/AndroidCommon.h" + +#include +#include + +#include + +std::string GetJString(JNIEnv* env, jstring jstr) +{ + std::string result = ""; + if (!jstr) + return result; + + const char* s = env->GetStringUTFChars(jstr, nullptr); + result = s; + env->ReleaseStringUTFChars(jstr, s); + return result; +} + +jstring ToJString(JNIEnv* env, const std::string& str) +{ + return env->NewStringUTF(str.c_str()); +} + +std::vector JStringArrayToVector(JNIEnv* env, jobjectArray array) +{ + const jsize size = env->GetArrayLength(array); + std::vector result; + result.reserve(size); + + for (jsize i = 0; i < size; ++i) + result.push_back(GetJString(env, (jstring)env->GetObjectArrayElement(array, i))); + + return result; +} -- cgit v1.2.3