Merge pull request #14230 from Sintendo/file-search

Common/FileSearch: Refactor DoFileSearch

3 files changed, 5 insertions, 7 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 48eebbb7f6..a0a3f7c8c2 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
diff --git a/Source/Core/InputCommon/DynamicInputTextureManager.cpp b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
index af5214bd37..be5c963409 100644
--- a/Source/Core/InputCommon/DynamicInputTextureManager.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
@@ -9,12 +9,10 @@
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
 #include "Core/ConfigManager.h"
-#include "Core/Core.h"
 
 #include "InputCommon/DynamicInputTextures/DITConfiguration.h"
 #include "InputCommon/ImageOperations.h"
 #include "VideoCommon/HiresTextures.h"
-#include "VideoCommon/TextureCacheBase.h"
 
 namespace InputCommon
 {
@@ -32,7 +30,7 @@ void DynamicInputTextureManager::Load()
 
   for (const auto& dynamic_input_directory : dynamic_input_directories)
   {
-    const auto json_files = Common::DoFileSearch({dynamic_input_directory}, {".json"});
+    const auto json_files = Common::DoFileSearch(dynamic_input_directory, ".json");
     for (auto& file : json_files)
     {
       m_configuration.emplace_back(file);
diff --git a/Source/Core/InputCommon/InputProfile.cpp b/Source/Core/InputCommon/InputProfile.cpp
index 0bb452ac1e..f483e8a9c3 100644
--- a/Source/Core/InputCommon/InputProfile.cpp
+++ b/Source/Core/InputCommon/InputProfile.cpp
@@ -15,8 +15,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
-#include "Core/HotkeyManager.h"
 
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/InputConfig.h"
 
@@ -37,7 +37,7 @@ std::vector<std::string> GetProfilesFromSetting(const std::string& setting, cons
     const std::string path = root + std::string(StripWhitespace(setting_choice));
     if (File::IsDirectory(path))
     {
-      const auto files_under_directory = Common::DoFileSearch({path}, {".ini"}, true);
+      const auto files_under_directory = Common::DoFileSearch(path, ".ini", true);
       result.insert(result.end(), files_under_directory.begin(), files_under_directory.end());
     }
     else
@@ -57,7 +57,7 @@ std::vector<std::string> ProfileCycler::GetProfilesForDevice(InputConfig* device
 {
   const std::string device_profile_root_location(
       device_configuration->GetUserProfileDirectoryPath());
-  return Common::DoFileSearch({device_profile_root_location}, {".ini"}, true);
+  return Common::DoFileSearch(device_profile_root_location, ".ini", true);
 }
 
 std::string ProfileCycler::GetProfile(CycleDirection cycle_direction, int& profile_index,