ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: switched to use only wstring for FilePath::filename and FilePath::extension

Browse Source
This commit is contained in:
mlangkabel
2018-02-09 17:04:17 +01:00
parent 70d619a173
commit e31624a4b7
30 changed files with 68 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/file/FilePath.cpp
+6 -16
View File
@@ -381,22 +381,12 @@ std::string FilePath::getBackslashedString() const
return utility::replace(str(), "/", "\\");
}
std::string FilePath::fileName() const
{
return m_path->filename().generic_string();
}
std::wstring FilePath::wFileName() const
std::wstring FilePath::fileName() const
{
return m_path->filename().generic_wstring();
}
std::string FilePath::extension() const
{
return m_path->extension().generic_string();
}
std::wstring FilePath::wExtension() const
std::wstring FilePath::extension() const
{
return m_path->extension().generic_wstring();
}
@@ -406,15 +396,15 @@ FilePath FilePath::withoutExtension() const
return FilePath(getPath().replace_extension().wstring());
}
FilePath FilePath::replaceExtension(const std::string& extension) const
FilePath FilePath::replaceExtension(const std::wstring& extension) const
{
return FilePath(getPath().replace_extension(extension).wstring());
}
bool FilePath::hasExtension(const std::vector<std::string>& extensions) const
bool FilePath::hasExtension(const std::vector<std::wstring>& extensions) const
{
std::string e = extension();
for (const std::string& ext : extensions)
const std::wstring e = extension();
for (const std::wstring& ext : extensions)
{
if (e == ext)
{