FileSearch: Namespace functions under the Common namespace

This commit is contained in:
Lioncash
2017-04-07 01:02:14 -04:00
parent f94cd57a70
commit f7a2f6ad01
9 changed files with 18 additions and 11 deletions
@@ -187,9 +187,9 @@ void InterfaceConfigPane::LoadGUIValues()
void InterfaceConfigPane::LoadThemes()
{
auto sv =
DoFileSearch({""}, {File::GetUserPath(D_THEMES_IDX), File::GetSysDirectory() + THEMES_DIR},
/*recursive*/ false);
auto sv = Common::DoFileSearch(
{""}, {File::GetUserPath(D_THEMES_IDX), File::GetSysDirectory() + THEMES_DIR},
/*recursive*/ false);
for (const std::string& filename : sv)
{
std::string name, ext;
+1 -1
View File
@@ -1593,7 +1593,7 @@ void CFrame::GameListChanged(wxCommandEvent& event)
break;
case IDM_PURGE_GAME_LIST_CACHE:
std::vector<std::string> rFilenames =
DoFileSearch({".cache"}, {File::GetUserPath(D_CACHE_IDX)});
Common::DoFileSearch({".cache"}, {File::GetUserPath(D_CACHE_IDX)});
for (const std::string& rFilename : rFilenames)
{
+3 -2
View File
@@ -663,8 +663,9 @@ void CGameListCtrl::ScanForISOs()
m_ISOFiles.clear();
const auto custom_titles = LoadCustomTitles();
auto rFilenames = DoFileSearch(GetFileSearchExtensions(), SConfig::GetInstance().m_ISOFolder,
SConfig::GetInstance().m_RecursiveISOFolder);
auto rFilenames =
Common::DoFileSearch(GetFileSearchExtensions(), SConfig::GetInstance().m_ISOFolder,
SConfig::GetInstance().m_RecursiveISOFolder);
if (rFilenames.size() > 0)
{
@@ -264,7 +264,7 @@ void InputConfigDialog::UpdateProfileComboBox()
pname += PROFILES_PATH;
pname += m_config.GetProfileName();
std::vector<std::string> sv = DoFileSearch({".ini"}, {pname});
std::vector<std::string> sv = Common::DoFileSearch({".ini"}, {pname});
wxArrayString strs;
for (const std::string& filename : sv)