feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ICore: Change some path API to use FilePath

Browse Source 
Change-Id: Id841d6177206a021c9e606ce560b47d1ae6e52b9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2021-04-22 16:15:26 +02:00
parent b2c0554733
commit c1f90aeca2
79 changed files with 260 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/texteditor/fontsettings.cpp
View File

@@ -504,20 +504,19 @@ int FontSettings::defaultFontSize()
*/
QString FontSettings::defaultSchemeFileName(const QString &fileName)
{
QString defaultScheme = Core::ICore::resourcePath();
defaultScheme += QLatin1String("/styles/");
Utils::FilePath defaultScheme = Core::ICore::resourcePath() / "styles";
if (!fileName.isEmpty() && QFile::exists(defaultScheme + fileName)) {
defaultScheme += fileName;
if (!fileName.isEmpty() && (defaultScheme / fileName).exists()) {
defaultScheme = defaultScheme / fileName;
} else {
const QString themeScheme = Utils::creatorTheme()->defaultTextEditorColorScheme();
if (!themeScheme.isEmpty() && QFile::exists(defaultScheme + themeScheme))
defaultScheme += themeScheme;
if (!themeScheme.isEmpty() && (defaultScheme / themeScheme).exists())
defaultScheme = defaultScheme / themeScheme;
else
defaultScheme += QLatin1String("default.xml");
defaultScheme = defaultScheme / "default.xml";
}
return defaultScheme;
return defaultScheme.toString();
}
} // namespace TextEditor