From 342e066886ff4d472d9e07eb1f5702a548ac3e6e Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 22 Sep 2023 16:15:27 +0200 Subject: Utils, all: Standardize on QtcSettings Change-Id: Id222016f15b1c3bfe6710fe5d0297666d4565ef1 Reviewed-by: Marcus Tillmanns --- src/plugins/texteditor/highlighter.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/plugins/texteditor/highlighter.cpp') diff --git a/src/plugins/texteditor/highlighter.cpp b/src/plugins/texteditor/highlighter.cpp index 4512b71910..cc7bc395bd 100644 --- a/src/plugins/texteditor/highlighter.cpp +++ b/src/plugins/texteditor/highlighter.cpp @@ -138,10 +138,10 @@ Highlighter::Definitions Highlighter::definitionsForDocument(const TextDocument return definitions; } -static Highlighter::Definition definitionForSetting(const QString &settingsKey, +static Highlighter::Definition definitionForSetting(const Key &settingsKey, const QString &mapKey) { - QSettings *settings = Core::ICore::settings(); + QtcSettings *settings = Core::ICore::settings(); settings->beginGroup(Constants::HIGHLIGHTER_SETTINGS_CATEGORY); const QString &definitionName = settings->value(settingsKey).toMap().value(mapKey).toString(); settings->endGroup(); @@ -188,23 +188,23 @@ void Highlighter::rememberDefinitionForDocument(const Highlighter::Definition &d const QString &mimeType = document->mimeType(); const FilePath &path = document->filePath(); const QString &fileExtension = path.completeSuffix(); - QSettings *settings = Core::ICore::settings(); + QtcSettings *settings = Core::ICore::settings(); settings->beginGroup(Constants::HIGHLIGHTER_SETTINGS_CATEGORY); const Definitions &fileNameDefinitions = definitionsForFileName(path); if (fileNameDefinitions.contains(definition)) { if (!fileExtension.isEmpty()) { - const QString id(kDefinitionForExtension); + const Key id(kDefinitionForExtension); QMap map = settings->value(id).toMap(); map.insert(fileExtension, definition.name()); settings->setValue(id, map); } else if (!path.isEmpty()) { - const QString id(kDefinitionForFilePath); + const Key id(kDefinitionForFilePath); QMap map = settings->value(id).toMap(); map.insert(path.absoluteFilePath().toString(), definition.name()); settings->setValue(id, map); } } else if (!mimeType.isEmpty()) { - const QString id(kDefinitionForMimeType); + const Key id(kDefinitionForMimeType); QMap map = settings->value(id).toMap(); map.insert(mimeType, definition.name()); settings->setValue(id, map); @@ -214,7 +214,7 @@ void Highlighter::rememberDefinitionForDocument(const Highlighter::Definition &d void Highlighter::clearDefinitionForDocumentCache() { - QSettings *settings = Core::ICore::settings(); + QtcSettings *settings = Core::ICore::settings(); settings->beginGroup(Constants::HIGHLIGHTER_SETTINGS_CATEGORY); settings->remove(kDefinitionForMimeType); settings->remove(kDefinitionForExtension); @@ -227,7 +227,8 @@ void Highlighter::addCustomHighlighterPath(const FilePath &path) highlightRepository()->addCustomSearchPath(path.toString()); } -void Highlighter::downloadDefinitions(std::function callback) { +void Highlighter::downloadDefinitions(std::function callback) +{ auto downloader = new KSyntaxHighlighting::DefinitionDownloader(highlightRepository()); connect(downloader, &KSyntaxHighlighting::DefinitionDownloader::done, [downloader, callback]() { -- cgit v1.2.3