diff options
author | hjk <hjk@qt.io> | 2023-08-29 15:45:38 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2023-08-31 13:20:59 +0000 |
commit | 09f15a31dfd4e9ff4c860fb7c38c1003a85638db (patch) | |
tree | 5978c6c461ce265de0a0e745f65c98ff84411e5d /src | |
parent | 246f33c20d1f9589a891223c820d009212d8bb00 (diff) |
Utils: Remove the non-QTC_USE_STORE case
Change-Id: I857a38c80470d1b474ca0f291a93ed58fbcc0bf4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/utils/id.cpp | 4 | ||||
-rw-r--r-- | src/libs/utils/store.cpp | 10 | ||||
-rw-r--r-- | src/libs/utils/store.h | 6 | ||||
-rw-r--r-- | src/libs/utils/storekey.h | 14 | ||||
-rw-r--r-- | src/plugins/fakevim/fakevimactions.h | 4 |
5 files changed, 0 insertions, 38 deletions
diff --git a/src/libs/utils/id.cpp b/src/libs/utils/id.cpp index 60417d1b7ca..383d992da0d 100644 --- a/src/libs/utils/id.cpp +++ b/src/libs/utils/id.cpp @@ -161,11 +161,7 @@ QString Id::toString() const /*! \internal */ Key Id::toKey() const { -#ifdef QTC_USE_STORE return name(); -#else - return toString(); -#endif } /*! diff --git a/src/libs/utils/store.cpp b/src/libs/utils/store.cpp index 96425d8f467..d48adc2cde4 100644 --- a/src/libs/utils/store.cpp +++ b/src/libs/utils/store.cpp @@ -38,7 +38,6 @@ Store storeFromVariant(const QVariant &value) return Store(); } -#ifdef QTC_USE_STORE static QVariantList storeListFromMapList(const QVariantList &mapList) { QVariantList storeList; @@ -70,11 +69,9 @@ static QVariantList mapListFromStoreList(const QVariantList &storeList) return mapList; } -#endif Store storeFromMap(const QVariantMap &map) { -#ifdef QTC_USE_STORE Store store; for (auto it = map.begin(); it != map.end(); ++it) { if (it.value().type() == QVariant::Map) { @@ -87,14 +84,10 @@ Store storeFromMap(const QVariantMap &map) } } return store; -#else - return map; -#endif } QVariantMap mapFromStore(const Store &store) { -#ifdef QTC_USE_STORE QVariantMap map; for (auto it = store.begin(); it != store.end(); ++it) { if (it.value().metaType() == QMetaType::fromType<Store>()) @@ -105,9 +98,6 @@ QVariantMap mapFromStore(const Store &store) map.insert(stringFromKey(it.key()), it.value()); } return map; -#else - return store; -#endif } bool isStore(const QVariant &value) diff --git a/src/libs/utils/store.h b/src/libs/utils/store.h index 85f677151fa..3050251bc1c 100644 --- a/src/libs/utils/store.h +++ b/src/libs/utils/store.h @@ -12,11 +12,7 @@ namespace Utils { using KeyList = QList<Key>; -#ifdef QTC_USE_STORE using Store = QMap<Key, QVariant>; -#else -using Store = QVariantMap; -#endif QTCREATOR_UTILS_EXPORT KeyList keysFromStrings(const QStringList &list); QTCREATOR_UTILS_EXPORT QStringList stringsFromKeys(const KeyList &list); @@ -33,6 +29,4 @@ QTCREATOR_UTILS_EXPORT Key numberedKey(const Key &key, int number); } // Utils -#ifdef QTC_USE_STORE Q_DECLARE_METATYPE(Utils::Store) -#endif diff --git a/src/libs/utils/storekey.h b/src/libs/utils/storekey.h index 4f7e4516fc6..7e02353e17a 100644 --- a/src/libs/utils/storekey.h +++ b/src/libs/utils/storekey.h @@ -9,23 +9,9 @@ namespace Utils { -// Opt-in to new classes during the transition phase. -#define QTC_USE_STORE - -#ifdef QTC_USE_STORE - using Key = QByteArray; inline Key keyFromString(const QString &str) { return str.toUtf8(); } inline QString stringFromKey(const Key &key) { return QString::fromUtf8(key); } -#else - -using Key = QString; - -inline Key keyFromString(const QString &str) { return str; } -inline QString stringFromKey(const Key &key) { return key; } - -#endif - } // Utils diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h index 29d4bbd7052..ac4256eca02 100644 --- a/src/plugins/fakevim/fakevimactions.h +++ b/src/plugins/fakevim/fakevimactions.h @@ -25,11 +25,7 @@ namespace FakeVim::Internal { #ifdef FAKEVIM_STANDALONE -#ifdef QTC_USE_STORE using Key = QByteArray; -#else -using Key = QString; -#endif class FvBaseAspect { |