From 842770b6b57d1326b23a83e99451ad4a3cde5f74 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 15 Jul 2021 17:11:53 +0200 Subject: [PATCH] TextEditor: Fix path to code styles Was broken by c1f90aeca2. Fixes: QTCREATORBUG-25989 Change-Id: I91879e0adb3cd90be8abddd6a1ca02364b8b9fce Reviewed-by: Eike Ziller --- src/plugins/texteditor/codestylepool.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/texteditor/codestylepool.cpp b/src/plugins/texteditor/codestylepool.cpp index 2a2fe260142..64a41be1706 100644 --- a/src/plugins/texteditor/codestylepool.cpp +++ b/src/plugins/texteditor/codestylepool.cpp @@ -92,9 +92,9 @@ QByteArray CodeStylePoolPrivate::generateUniqueId(const QByteArray &id) const } } -static QString customCodeStylesPath() +static Utils::FilePath customCodeStylesPath() { - return Core::ICore::userResourcePath("codestyles").toString(); + return Core::ICore::userResourcePath("codestyles"); } CodeStylePool::CodeStylePool(ICodeStylePreferencesFactory *factory, QObject *parent) @@ -112,7 +112,7 @@ CodeStylePool::~CodeStylePool() QString CodeStylePool::settingsDir() const { const QString suffix = d->m_factory ? d->m_factory->languageId().toString() : QLatin1String("default"); - return customCodeStylesPath().append(suffix); + return customCodeStylesPath().pathAppended(suffix).toString(); } Utils::FilePath CodeStylePool::settingsPath(const QByteArray &id) const @@ -261,7 +261,7 @@ void CodeStylePool::slotSaveCodeStyle() void CodeStylePool::saveCodeStyle(ICodeStylePreferences *codeStyle) const { - const QString codeStylesPath = customCodeStylesPath(); + const QString codeStylesPath = customCodeStylesPath().toString(); // Create the base directory when it doesn't exist if (!QFile::exists(codeStylesPath) && !QDir().mkpath(codeStylesPath)) {