From 2bf886ed7310d9d789849a528f34db71bf4f8602 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 23 Aug 2023 17:51:05 +0200 Subject: Utils: Use a bit more Key and Store Also, separate the Key into a separate header to minimiz impact on #include load. Change-Id: I4f719cad4d23a71a9c228d0b7f5c2409fd6e24d5 Reviewed-by: Reviewed-by: Marcus Tillmanns --- src/plugins/texteditor/behaviorsettings.cpp | 10 +++++----- src/plugins/texteditor/behaviorsettings.h | 4 ++-- src/plugins/texteditor/behaviorsettingspage.cpp | 4 +++- src/plugins/texteditor/extraencodingsettings.cpp | 8 ++++---- src/plugins/texteditor/extraencodingsettings.h | 2 +- src/plugins/texteditor/findinfiles.cpp | 3 +-- src/plugins/texteditor/icodestylepreferences.cpp | 8 ++++---- src/plugins/texteditor/icodestylepreferences.h | 4 ++-- src/plugins/texteditor/storagesettings.cpp | 9 ++++----- src/plugins/texteditor/storagesettings.h | 4 ++-- src/plugins/texteditor/tabsettings.cpp | 11 +++++------ src/plugins/texteditor/tabsettings.h | 4 ++-- src/plugins/texteditor/typingsettings.cpp | 8 ++++---- src/plugins/texteditor/typingsettings.h | 4 ++-- 14 files changed, 41 insertions(+), 42 deletions(-) (limited to 'src/plugins/texteditor') diff --git a/src/plugins/texteditor/behaviorsettings.cpp b/src/plugins/texteditor/behaviorsettings.cpp index f8356d6916..0a63886716 100644 --- a/src/plugins/texteditor/behaviorsettings.cpp +++ b/src/plugins/texteditor/behaviorsettings.cpp @@ -33,18 +33,18 @@ BehaviorSettings::BehaviorSettings() : { } -void BehaviorSettings::toSettings(const QString &category) const +void BehaviorSettings::toSettings(const Key &category) const { - Utils::toSettings(QLatin1String(groupPostfix), category, Core::ICore::settings(), this); + Utils::toSettings(groupPostfix, category, Core::ICore::settings(), this); } -void BehaviorSettings::fromSettings(const QString &category) +void BehaviorSettings::fromSettings(const Key &category) { *this = BehaviorSettings(); - Utils::fromSettings(QLatin1String(groupPostfix), category, Core::ICore::settings(), this); + Utils::fromSettings(groupPostfix, category, Core::ICore::settings(), this); } -QVariantMap BehaviorSettings::toMap() const +Store BehaviorSettings::toMap() const { return { {mouseHidingKey, m_mouseHiding}, diff --git a/src/plugins/texteditor/behaviorsettings.h b/src/plugins/texteditor/behaviorsettings.h index a4a1f60fce..e33fe5a257 100644 --- a/src/plugins/texteditor/behaviorsettings.h +++ b/src/plugins/texteditor/behaviorsettings.h @@ -18,8 +18,8 @@ class TEXTEDITOR_EXPORT BehaviorSettings public: BehaviorSettings(); - void toSettings(const QString &category) const; - void fromSettings(const QString &category); + void toSettings(const Utils::Key &category) const; + void fromSettings(const Utils::Key &category); Utils::Store toMap() const; void fromMap(const Utils::Store &map); diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp index 2fcbdab4cc..705f8ba8d2 100644 --- a/src/plugins/texteditor/behaviorsettingspage.cpp +++ b/src/plugins/texteditor/behaviorsettingspage.cpp @@ -33,6 +33,8 @@ #include #include +using namespace Utils; + namespace TextEditor { class BehaviorSettingsPagePrivate : public QObject @@ -40,7 +42,7 @@ class BehaviorSettingsPagePrivate : public QObject public: BehaviorSettingsPagePrivate(); - const QString m_settingsPrefix{"text"}; + const Key m_settingsPrefix{"text"}; TextEditor::BehaviorSettingsWidget *m_behaviorWidget = nullptr; CodeStylePool *m_defaultCodeStylePool = nullptr; diff --git a/src/plugins/texteditor/extraencodingsettings.cpp b/src/plugins/texteditor/extraencodingsettings.cpp index 34c46e8cf6..91587f1946 100644 --- a/src/plugins/texteditor/extraencodingsettings.cpp +++ b/src/plugins/texteditor/extraencodingsettings.cpp @@ -23,19 +23,19 @@ ExtraEncodingSettings::ExtraEncodingSettings() : m_utf8BomSetting(OnlyKeep) ExtraEncodingSettings::~ExtraEncodingSettings() = default; -void ExtraEncodingSettings::toSettings(const QString &category) const +void ExtraEncodingSettings::toSettings(const Key &category) const { Q_UNUSED(category) - Utils::toSettings(QLatin1String(kGroupPostfix), QString(), Core::ICore::settings(), this); + Utils::toSettings(kGroupPostfix, Key(), Core::ICore::settings(), this); } -void ExtraEncodingSettings::fromSettings(const QString &category) +void ExtraEncodingSettings::fromSettings(const Key &category) { Q_UNUSED(category) *this = ExtraEncodingSettings(); - Utils::fromSettings(QLatin1String(kGroupPostfix), QString(), Core::ICore::settings(), this); + Utils::fromSettings(kGroupPostfix, Key(), Core::ICore::settings(), this); } QVariantMap ExtraEncodingSettings::toMap() const diff --git a/src/plugins/texteditor/extraencodingsettings.h b/src/plugins/texteditor/extraencodingsettings.h index 1104bd0354..7f64dd0993 100644 --- a/src/plugins/texteditor/extraencodingsettings.h +++ b/src/plugins/texteditor/extraencodingsettings.h @@ -16,7 +16,7 @@ public: ~ExtraEncodingSettings(); void toSettings(const QString &category) const; - void fromSettings(const QString &category); + void fromSettings(const Utils::Key &category); Utils::Store toMap() const; void fromMap(const Utils::Store &map); diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 64b2a78fb7..8156c10b18 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -142,8 +142,7 @@ QWidget *FindInFiles::createConfigWidget() connect(m_directory.data(), &PathChooser::textChanged, this, [this] { setSearchDir(m_directory->filePath()); }); connect(this, &BaseFileFind::searchDirChanged, m_directory, &PathChooser::setFilePath); - m_directory->setHistoryCompleter(QLatin1String(HistoryKey), - /*restoreLastItemFromHistory=*/ true); + m_directory->setHistoryCompleter(HistoryKey, /*restoreLastItemFromHistory=*/ true); if (!HistoryCompleter::historyExistsFor(QLatin1String(HistoryKey))) { auto completer = static_cast(m_directory->lineEdit()->completer()); const QStringList legacyHistory = ICore::settings()->value( diff --git a/src/plugins/texteditor/icodestylepreferences.cpp b/src/plugins/texteditor/icodestylepreferences.cpp index 1f98062712..3fffa8401a 100644 --- a/src/plugins/texteditor/icodestylepreferences.cpp +++ b/src/plugins/texteditor/icodestylepreferences.cpp @@ -27,7 +27,7 @@ public: bool m_readOnly = false; bool m_temporarilyReadOnly = false; bool m_isAdditionalTabDisabled = false; - QString m_settingsSuffix; + Key m_settingsSuffix; }; } @@ -207,17 +207,17 @@ void ICodeStylePreferences::setCurrentDelegate(const QByteArray &id) setCurrentDelegate(d->m_pool->codeStyle(id)); } -void ICodeStylePreferences::setSettingsSuffix(const QString &suffix) +void ICodeStylePreferences::setSettingsSuffix(const Key &suffix) { d->m_settingsSuffix = suffix; } -void ICodeStylePreferences::toSettings(const QString &category) const +void ICodeStylePreferences::toSettings(const Key &category) const { Utils::toSettings(d->m_settingsSuffix, category, Core::ICore::settings(), this); } -void ICodeStylePreferences::fromSettings(const QString &category) +void ICodeStylePreferences::fromSettings(const Key &category) { Utils::fromSettings(d->m_settingsSuffix, category, Core::ICore::settings(), this); } diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h index a3eedfb5c5..1305e0679a 100644 --- a/src/plugins/texteditor/icodestylepreferences.h +++ b/src/plugins/texteditor/icodestylepreferences.h @@ -64,9 +64,9 @@ public: QByteArray currentDelegateId() const; void setCurrentDelegate(const QByteArray &id); - void setSettingsSuffix(const QString &suffix); + void setSettingsSuffix(const Utils::Key &suffix); void toSettings(const QString &category) const; - void fromSettings(const QString &category); + void fromSettings(const Utils::Key &category); // make below 2 protected? virtual Utils::Store toMap() const; diff --git a/src/plugins/texteditor/storagesettings.cpp b/src/plugins/texteditor/storagesettings.cpp index b70eb3ec14..6352bf3e56 100644 --- a/src/plugins/texteditor/storagesettings.cpp +++ b/src/plugins/texteditor/storagesettings.cpp @@ -9,7 +9,6 @@ #include #include -#include using namespace Utils; @@ -34,15 +33,15 @@ StorageSettings::StorageSettings() { } -void StorageSettings::toSettings(const QString &category) const +void StorageSettings::toSettings(const Key &category) const { - Utils::toSettings(QLatin1String(groupPostfix), category, Core::ICore::settings(), this); + Utils::toSettings(groupPostfix, category, Core::ICore::settings(), this); } -void StorageSettings::fromSettings(const QString &category) +void StorageSettings::fromSettings(const Key &category) { *this = StorageSettings(); - Utils::fromSettings(QLatin1String(groupPostfix), category, Core::ICore::settings(), this); + Utils::fromSettings(groupPostfix, category, Core::ICore::settings(), this); } Store StorageSettings::toMap() const diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h index bff84b6fc0..bf3ac1ba32 100644 --- a/src/plugins/texteditor/storagesettings.h +++ b/src/plugins/texteditor/storagesettings.h @@ -14,8 +14,8 @@ class TEXTEDITOR_EXPORT StorageSettings public: StorageSettings(); - void toSettings(const QString &category) const; - void fromSettings(const QString &category); + void toSettings(const Utils::Key &category) const; + void fromSettings(const Utils::Key &category); Utils::Store toMap() const; void fromMap(const Utils::Store &map); diff --git a/src/plugins/texteditor/tabsettings.cpp b/src/plugins/texteditor/tabsettings.cpp index a11b564994..2668d4f88f 100644 --- a/src/plugins/texteditor/tabsettings.cpp +++ b/src/plugins/texteditor/tabsettings.cpp @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -34,18 +33,18 @@ TabSettings::TabSettings(TabSettings::TabPolicy tabPolicy, } -void TabSettings::toSettings(const QString &category, QSettings *s) const +void TabSettings::toSettings(const Key &category, QSettings *s) const { - Utils::toSettings(QLatin1String(groupPostfix), category, s, this); + Utils::toSettings(groupPostfix, category, s, this); } -void TabSettings::fromSettings(const QString &category, QSettings *s) +void TabSettings::fromSettings(const Key &category, QSettings *s) { *this = TabSettings(); // Assign defaults - Utils::fromSettings(QLatin1String(groupPostfix), category, s, this); + Utils::fromSettings(groupPostfix, category, s, this); } -QVariantMap TabSettings::toMap() const +Store TabSettings::toMap() const { return { {spacesForTabsKey, m_tabPolicy != TabsOnlyTabPolicy}, diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h index 57adca91a0..a4a6f1c3f2 100644 --- a/src/plugins/texteditor/tabsettings.h +++ b/src/plugins/texteditor/tabsettings.h @@ -38,8 +38,8 @@ public: TabSettings(TabPolicy tabPolicy, int tabSize, int indentSize, ContinuationAlignBehavior continuationAlignBehavior); - void toSettings(const QString &category, QSettings *s) const; - void fromSettings(const QString &category, QSettings *s); + void toSettings(const Utils::Key &category, QSettings *s) const; + void fromSettings(const Utils::Key &category, QSettings *s); Utils::Store toMap() const; void fromMap(const Utils::Store &map); diff --git a/src/plugins/texteditor/typingsettings.cpp b/src/plugins/texteditor/typingsettings.cpp index 7fa6b84c7e..402d472848 100644 --- a/src/plugins/texteditor/typingsettings.cpp +++ b/src/plugins/texteditor/typingsettings.cpp @@ -28,15 +28,15 @@ TypingSettings::TypingSettings(): { } -void TypingSettings::toSettings(const QString &category) const +void TypingSettings::toSettings(const Key &category) const { - Utils::toSettings(QLatin1String(groupPostfix), category, Core::ICore::settings(), this); + Utils::toSettings(groupPostfix, category, Core::ICore::settings(), this); } -void TypingSettings::fromSettings(const QString &category) +void TypingSettings::fromSettings(const Key &category) { *this = TypingSettings(); // Assign defaults - Utils::fromSettings(QLatin1String(groupPostfix), category, Core::ICore::settings(), this); + Utils::fromSettings(groupPostfix, category, Core::ICore::settings(), this); } Store TypingSettings::toMap() const diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h index 8cb9eee8d1..63b1e6bea1 100644 --- a/src/plugins/texteditor/typingsettings.h +++ b/src/plugins/texteditor/typingsettings.h @@ -35,8 +35,8 @@ public: bool tabShouldIndent(const QTextDocument *document, const QTextCursor &cursor, int *suggestedPosition) const; - void toSettings(const QString &category) const; - void fromSettings(const QString &category); + void toSettings(const Utils::Key &category) const; + void fromSettings(const Utils::Key &category); Utils::Store toMap() const; void fromMap(const Utils::Store &map); -- cgit v1.2.3