From 60ca0626dfc2a59cc2e8145d0ee5c7d95f7d0ab5 Mon Sep 17 00:00:00 2001
From: Sintendo <3380580+Sintendo@users.noreply.github.com>
Date: Fri, 26 Dec 2025 21:57:28 +0100
Subject: [PATCH] Remove VectorToJStringArray

---
 Source/Android/jni/AndroidCommon/AndroidCommon.h            | 4 ----
 Source/Android/jni/Config/PostProcessing.cpp                | 6 +++---
 Source/Android/jni/GameList/GameFileCache.cpp               | 2 +-
 .../InputCommon/ControllerInterface/Android/Android.cpp     | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.h b/Source/Android/jni/AndroidCommon/AndroidCommon.h
index d4f7f0a3d11..e04180ef20b 100644
--- a/Source/Android/jni/AndroidCommon/AndroidCommon.h
+++ b/Source/Android/jni/AndroidCommon/AndroidCommon.h
@@ -17,10 +17,6 @@ jstring ToJString(JNIEnv* env, std::string_view str);
 std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array);
 jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string_view> span);
 jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string> span);
-inline jobjectArray VectorToJStringArray(JNIEnv* env, const std::vector<std::string>& vector)
-{
-  return SpanToJStringArray(env, vector);
-}
 
 template <typename T, typename F>
 jobjectArray SpanToJObjectArray(JNIEnv* env, std::span<const T> span, jclass clazz, F f)
diff --git a/Source/Android/jni/Config/PostProcessing.cpp b/Source/Android/jni/Config/PostProcessing.cpp
index ea1b9d8ad4a..5576c2d314a 100644
--- a/Source/Android/jni/Config/PostProcessing.cpp
+++ b/Source/Android/jni/Config/PostProcessing.cpp
@@ -15,20 +15,20 @@ JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getShaderList(JNIEnv* env,
                                                                                     jclass)
 {
-  return VectorToJStringArray(env, VideoCommon::PostProcessing::GetShaderList());
+  return SpanToJStringArray(env, VideoCommon::PostProcessing::GetShaderList());
 }
 
 JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getAnaglyphShaderList(
     JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, VideoCommon::PostProcessing::GetAnaglyphShaderList());
+  return SpanToJStringArray(env, VideoCommon::PostProcessing::GetAnaglyphShaderList());
 }
 
 JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getPassiveShaderList(
     JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, VideoCommon::PostProcessing::GetPassiveShaderList());
+  return SpanToJStringArray(env, VideoCommon::PostProcessing::GetPassiveShaderList());
 }
 }
diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp
index 39dc524c65e..c0a78c8cee2 100644
--- a/Source/Android/jni/GameList/GameFileCache.cpp
+++ b/Source/Android/jni/GameList/GameFileCache.cpp
@@ -46,7 +46,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCach
 JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_model_GameFileCache_getIsoPaths(JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, Config::GetIsoPaths());
+  return SpanToJStringArray(env, Config::GetIsoPaths());
 }
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_setIsoPaths(
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 48eebbb7f6d..a0a3f7c8c28 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -1173,7 +1173,7 @@ JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_getAllDeviceStrings(
     JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, g_controller_interface.GetAllDeviceStrings());
+  return SpanToJStringArray(env, g_controller_interface.GetAllDeviceStrings());
 }
 
 JNIEXPORT jobject JNICALL