diff options
author | hjk <hjk@qt.io> | 2023-08-23 16:53:06 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2023-08-24 05:56:57 +0000 |
commit | 6e307be365d3a4fd79b44589bde58d75590b4064 (patch) | |
tree | ff68dc3cc9b726185678d1d77fda30ad10a6030b /src/plugins/cppeditor | |
parent | 14d21f4f2cf0926ae9423450d646f5c21bdc3bdd (diff) |
Utils: Rename the new Storage to Store
Apparently that's what the young people on the web use for such a thing.
Change-Id: I75d5396ff3cb3c26efd6008b5f2261354c4f7896
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'src/plugins/cppeditor')
-rw-r--r-- | src/plugins/cppeditor/cppcodemodelsettings.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppcodemodelsettings.h | 6 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppcodestylepreferences.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppcodestylepreferences.h | 4 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppcodestylesettings.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppcodestylesettings.h | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp index 239a5a8e1b..318efd14e5 100644 --- a/src/plugins/cppeditor/cppcodemodelsettings.cpp +++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp @@ -558,7 +558,7 @@ QVariantMap ClangdSettings::Data::toMap() const return map; } -void ClangdSettings::Data::fromMap(const Storage &map) +void ClangdSettings::Data::fromMap(const Store &map) { useClangd = map.value(useClangdKey(), true).toBool(); executableFilePath = FilePath::fromString(map.value(clangdPathKey()).toString()); diff --git a/src/plugins/cppeditor/cppcodemodelsettings.h b/src/plugins/cppeditor/cppcodemodelsettings.h index c35ca85422..f4303146b7 100644 --- a/src/plugins/cppeditor/cppcodemodelsettings.h +++ b/src/plugins/cppeditor/cppcodemodelsettings.h @@ -9,7 +9,7 @@ #include <utils/clangutils.h> #include <utils/filepath.h> #include <utils/id.h> -#include <utils/storage.h> +#include <utils/store.h> #include <QObject> #include <QStringList> @@ -94,8 +94,8 @@ public: class CPPEDITOR_EXPORT Data { public: - Utils::Storage toMap() const; - void fromMap(const Utils::Storage &map); + Utils::Store toMap() const; + void fromMap(const Utils::Store &map); friend bool operator==(const Data &s1, const Data &s2) { diff --git a/src/plugins/cppeditor/cppcodestylepreferences.cpp b/src/plugins/cppeditor/cppcodestylepreferences.cpp index 27271edcfa..c6b497e021 100644 --- a/src/plugins/cppeditor/cppcodestylepreferences.cpp +++ b/src/plugins/cppeditor/cppcodestylepreferences.cpp @@ -80,7 +80,7 @@ QVariantMap CppCodeStylePreferences::toMap() const return map; } -void CppCodeStylePreferences::fromMap(const Storage &map) +void CppCodeStylePreferences::fromMap(const Store &map) { ICodeStylePreferences::fromMap(map); if (!currentDelegate()) diff --git a/src/plugins/cppeditor/cppcodestylepreferences.h b/src/plugins/cppeditor/cppcodestylepreferences.h index 2d10ace3bb..6ee7d8fc13 100644 --- a/src/plugins/cppeditor/cppcodestylepreferences.h +++ b/src/plugins/cppeditor/cppcodestylepreferences.h @@ -25,8 +25,8 @@ public: // tracks parent hierarchy until currentParentSettings is null CppCodeStyleSettings currentCodeStyleSettings() const; - Utils::Storage toMap() const override; - void fromMap(const Utils::Storage &map) override; + Utils::Store toMap() const override; + void fromMap(const Utils::Store &map) override; public slots: void setCodeStyleSettings(const CppCodeStyleSettings &data); diff --git a/src/plugins/cppeditor/cppcodestylesettings.cpp b/src/plugins/cppeditor/cppcodestylesettings.cpp index 33dd4617f8..2e04d3caa4 100644 --- a/src/plugins/cppeditor/cppcodestylesettings.cpp +++ b/src/plugins/cppeditor/cppcodestylesettings.cpp @@ -75,7 +75,7 @@ QVariantMap CppCodeStyleSettings::toMap() const }; } -void CppCodeStyleSettings::fromMap(const Storage &map) +void CppCodeStyleSettings::fromMap(const Store &map) { indentBlockBraces = map.value(indentBlockBracesKey, indentBlockBraces).toBool(); indentBlockBody = map.value(indentBlockBodyKey, indentBlockBody).toBool(); diff --git a/src/plugins/cppeditor/cppcodestylesettings.h b/src/plugins/cppeditor/cppcodestylesettings.h index 38041ccbb3..8369df099e 100644 --- a/src/plugins/cppeditor/cppcodestylesettings.h +++ b/src/plugins/cppeditor/cppcodestylesettings.h @@ -5,7 +5,7 @@ #include "cppeditor_global.h" -#include <utils/storage.h> +#include <utils/store.h> namespace CPlusPlus { class Overview; } namespace TextEditor { class TabSettings; } @@ -64,8 +64,8 @@ public: bool forceFormatting = false; #endif - Utils::Storage toMap() const; - void fromMap(const Utils::Storage &map); + Utils::Store toMap() const; + void fromMap(const Utils::Store &map); bool equals(const CppCodeStyleSettings &rhs) const; bool operator==(const CppCodeStyleSettings &s) const { return equals(s); } |