Merge pull request #8939 from JosJuice/oops

Android: Convert some files to LF

1 files changed, 39 insertions, 39 deletions

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 <string>

-#include <vector>

-

-#include <jni.h>

-

-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<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array)

-{

-  const jsize size = env->GetArrayLength(array);

-  std::vector<std::string> 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 <string>
+#include <vector>
+
+#include <jni.h>
+
+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<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array)
+{
+  const jsize size = env->GetArrayLength(array);
+  std::vector<std::string> result;
+  result.reserve(size);
+
+  for (jsize i = 0; i < size; ++i)
+    result.push_back(GetJString(env, (jstring)env->GetObjectArrayElement(array, i)));
+
+  return result;
+}