diff options
author | bunnei <bunneidev@gmail.com> | 2014-09-11 00:04:36 -0400 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-09-11 00:04:36 -0400 |
commit | 532a9e80a0bd242d2937335063b719130405d6bc (patch) | |
tree | 84fe1f054b62edc488a7a9e80eb8f79b2dd05cd0 /src/common/file_search.cpp | |
parent | d79fe3ebaadbc19e8ffe5075bad51a9735aafb38 (diff) | |
parent | 8fe5f2e2fe33ccde39bc79898052a8f679222964 (diff) |
Merge pull request #99 from archshift/ext-check
loader.cpp: improved file extension checking, made Upper/LowerStr useful, moved string_util into Common namespace
Diffstat (limited to 'src/common/file_search.cpp')
-rw-r--r-- | src/common/file_search.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/file_search.cpp b/src/common/file_search.cpp index cd50ace753..63580f6889 100644 --- a/src/common/file_search.cpp +++ b/src/common/file_search.cpp @@ -33,10 +33,10 @@ CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, cons void CFileSearch::FindFiles(const std::string& _searchString, const std::string& _strPath) { std::string GCMSearchPath; - BuildCompleteFilename(GCMSearchPath, _strPath, _searchString); + Common::BuildCompleteFilename(GCMSearchPath, _strPath, _searchString); #ifdef _WIN32 WIN32_FIND_DATA findData; - HANDLE FindFirst = FindFirstFile(UTF8ToTStr(GCMSearchPath).c_str(), &findData); + HANDLE FindFirst = FindFirstFile(Common::UTF8ToTStr(GCMSearchPath).c_str(), &findData); if (FindFirst != INVALID_HANDLE_VALUE) { @@ -47,7 +47,7 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string& if (findData.cFileName[0] != '.') { std::string strFilename; - BuildCompleteFilename(strFilename, _strPath, TStrToUTF8(findData.cFileName)); + Common::BuildCompleteFilename(strFilename, _strPath, Common::TStrToUTF8(findData.cFileName)); m_FileNames.push_back(strFilename); } |