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

src: wstring fixes for clang

Browse Source
This commit is contained in:
Eberhard Graether
2018-02-05 18:17:13 +01:00
parent 9e041c1f0a
commit f943d93335
11 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/utility/utilityQt.cpp
+2 -2
View File
@@ -37,9 +37,9 @@ namespace utility
widget->setSizePolicy(pol);
}
void loadFontsFromDirectory(const FilePath& path, const std::string& extension)
void loadFontsFromDirectory(const FilePath& path, const std::wstring& extension)
{
std::vector<std::string> extensions;
std::vector<std::wstring> extensions;
extensions.push_back(extension);
std::vector<FilePath> fontFilePaths = FileSystem::getFilePathsFromDirectory(path, extensions);
src/lib_gui/qt/utility/utilityQt.h
+1 -1
View File
@@ -15,7 +15,7 @@ namespace utility
void setWidgetBackgroundColor(QWidget* widget, const std::string& color);
void setWidgetRetainsSpaceWhenHidden(QWidget* widget);
void loadFontsFromDirectory(const FilePath& path, const std::string& extension = ".otf");
void loadFontsFromDirectory(const FilePath& path, const std::wstring& extension = L".otf");
std::string getStyleSheet(const FilePath& path);
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
, m_screenScaleFactor(nullptr)
{
m_colorSchemePaths =
FileSystem::getFilePathsFromDirectory(ResourcePaths::getColorSchemesPath(), std::vector<std::string>(1, ".xml"));
FileSystem::getFilePathsFromDirectory(ResourcePaths::getColorSchemesPath(), { L".xml" });
}
QtProjectWizzardContentPreferences::~QtProjectWizzardContentPreferences()
src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ std::vector<FilePath> JreSystemLibraryPathDetector::getPaths() const
for (const FilePath& jrePath: m_javaPathDetector->getPaths())
{
const FilePath javaRoot = jrePath.getParentDirectory().getParentDirectory().getParentDirectory();
for (const FilePath& jarPath : FileSystem::getFilePathsFromDirectory(javaRoot.getConcatenated(L"lib"), {".jar"}))
for (const FilePath& jarPath : FileSystem::getFilePathsFromDirectory(javaRoot.getConcatenated(L"lib"), { L".jar" }))
{
paths.push_back(jarPath);
}