Merge pull request #8939 from JosJuice/oops

Android: Convert some files to LF

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;
+}

Source/Android/jni/AndroidCommon/AndroidCommon.h

@@ -1,13 +1,13 @@
-// Copyright 2018 Dolphin Emulator Project
-// Licensed under GPLv2+
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <string>
-
-#include <jni.h>
-
-std::string GetJString(JNIEnv* env, jstring jstr);
-jstring ToJString(JNIEnv* env, const std::string& str);
-std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array);
+// Copyright 2018 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include <jni.h>
+
+std::string GetJString(JNIEnv* env, jstring jstr);
+jstring ToJString(JNIEnv* env, const std::string& str);
+std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array);