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

TextEditor: Fix path to code styles

Browse Source 
Was broken by c1f90aeca2.

Fixes: QTCREATORBUG-25989
Change-Id: I91879e0adb3cd90be8abddd6a1ca02364b8b9fce
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2021-07-15 17:11:53 +02:00
parent 67d85d1592
commit 842770b6b5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/codestylepool.cpp
View File

@@ -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) CodeStylePool::CodeStylePool(ICodeStylePreferencesFactory *factory, QObject *parent)
@@ -112,7 +112,7 @@ CodeStylePool::~CodeStylePool()
QString CodeStylePool::settingsDir() const QString CodeStylePool::settingsDir() const
{ {
const QString suffix = d->m_factory ? d->m_factory->languageId().toString() : QLatin1String("default"); 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 Utils::FilePath CodeStylePool::settingsPath(const QByteArray &id) const
@@ -261,7 +261,7 @@ void CodeStylePool::slotSaveCodeStyle()
void CodeStylePool::saveCodeStyle(ICodeStylePreferences *codeStyle) const void CodeStylePool::saveCodeStyle(ICodeStylePreferences *codeStyle) const
{ {
const QString codeStylesPath = customCodeStylesPath(); const QString codeStylesPath = customCodeStylesPath().toString();
// Create the base directory when it doesn't exist // Create the base directory when it doesn't exist
if (!QFile::exists(codeStylesPath) && !QDir().mkpath(codeStylesPath)) { if (!QFile::exists(codeStylesPath) && !QDir().mkpath(codeStylesPath)) {