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

Utils: Remove the non-QTC_USE_STORE case

Browse Source 
Change-Id: I857a38c80470d1b474ca0f291a93ed58fbcc0bf4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-08-29 15:45:38 +02:00
parent 246f33c20d
commit 09f15a31df
5 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/id.cpp
View File

@@ -161,11 +161,7 @@ QString Id::toString() const
/*! \internal */ /*! \internal */
Key Id::toKey() const Key Id::toKey() const
{ {
#ifdef QTC_USE_STORE
return name(); return name();
#else
return toString();
#endif
} }
/*! /*!

10
src/libs/utils/store.cpp
View File

@@ -38,7 +38,6 @@ Store storeFromVariant(const QVariant &value)
return Store(); return Store();
} }
#ifdef QTC_USE_STORE
static QVariantList storeListFromMapList(const QVariantList &mapList) static QVariantList storeListFromMapList(const QVariantList &mapList)
{ {
QVariantList storeList; QVariantList storeList;
@@ -70,11 +69,9 @@ static QVariantList mapListFromStoreList(const QVariantList &storeList)
return mapList; return mapList;
} }
#endif
Store storeFromMap(const QVariantMap &map) Store storeFromMap(const QVariantMap &map)
{ {
#ifdef QTC_USE_STORE
Store store; Store store;
for (auto it = map.begin(); it != map.end(); ++it) { for (auto it = map.begin(); it != map.end(); ++it) {
if (it.value().type() == QVariant::Map) { if (it.value().type() == QVariant::Map) {
@@ -87,14 +84,10 @@ Store storeFromMap(const QVariantMap &map)
} }
} }
return store; return store;
#else
return map;
#endif
} }
QVariantMap mapFromStore(const Store &store) QVariantMap mapFromStore(const Store &store)
{ {
#ifdef QTC_USE_STORE
QVariantMap map; QVariantMap map;
for (auto it = store.begin(); it != store.end(); ++it) { for (auto it = store.begin(); it != store.end(); ++it) {
if (it.value().metaType() == QMetaType::fromType<Store>()) if (it.value().metaType() == QMetaType::fromType<Store>())
@@ -105,9 +98,6 @@ QVariantMap mapFromStore(const Store &store)
map.insert(stringFromKey(it.key()), it.value()); map.insert(stringFromKey(it.key()), it.value());
} }
return map; return map;
#else
return store;
#endif
} }
bool isStore(const QVariant &value) bool isStore(const QVariant &value)

6
src/libs/utils/store.h
View File

@@ -12,11 +12,7 @@ namespace Utils {
using KeyList = QList<Key>; using KeyList = QList<Key>;
#ifdef QTC_USE_STORE
using Store = QMap<Key, QVariant>; using Store = QMap<Key, QVariant>;
#else
using Store = QVariantMap;
#endif
QTCREATOR_UTILS_EXPORT KeyList keysFromStrings(const QStringList &list); QTCREATOR_UTILS_EXPORT KeyList keysFromStrings(const QStringList &list);
QTCREATOR_UTILS_EXPORT QStringList stringsFromKeys(const KeyList &list); QTCREATOR_UTILS_EXPORT QStringList stringsFromKeys(const KeyList &list);
@@ -33,6 +29,4 @@ QTCREATOR_UTILS_EXPORT Key numberedKey(const Key &key, int number);
} // Utils } // Utils
#ifdef QTC_USE_STORE
Q_DECLARE_METATYPE(Utils::Store) Q_DECLARE_METATYPE(Utils::Store)
#endif

14
src/libs/utils/storekey.h
View File

@@ -9,23 +9,9 @@
namespace Utils { namespace Utils {
// Opt-in to new classes during the transition phase.
#define QTC_USE_STORE
#ifdef QTC_USE_STORE
using Key = QByteArray; using Key = QByteArray;
inline Key keyFromString(const QString &str) { return str.toUtf8(); } inline Key keyFromString(const QString &str) { return str.toUtf8(); }
inline QString stringFromKey(const Key &key) { return QString::fromUtf8(key); } 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 } // Utils

4
src/plugins/fakevim/fakevimactions.h
View File

@@ -25,11 +25,7 @@ namespace FakeVim::Internal {
#ifdef FAKEVIM_STANDALONE #ifdef FAKEVIM_STANDALONE
#ifdef QTC_USE_STORE
using Key = QByteArray; using Key = QByteArray;
#else
using Key = QString;
#endif
class FvBaseAspect class FvBaseAspect
{ {