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

Utils: Move storefrommap.h to store.cpp

Browse Source 
Will be used more widely.

Change-Id: I77bb7760e7b3bd1147ea1e1d6be196ef75f691a2
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-08-29 08:01:05 +02:00
parent aa7c817f7a
commit 6c5027ba0e
5 changed files with 75 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/CMakeLists.txt
View File

@@ -163,7 +163,6 @@ add_qtc_library(Utils
statuslabel.cpp statuslabel.h
store.cpp store.h
storekey.h
storefrommap.h
stringtable.cpp stringtable.h
stringutils.cpp stringutils.h
styleanimator.cpp styleanimator.h

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

@@ -27,4 +27,76 @@ Store storeFromVariant(const QVariant &value)
return value.value<Store>();
}
#ifdef QTC_USE_STORE
static QVariantList storeListFromMapList(const QVariantList &mapList)
{
QVariantList storeList;
for (const auto &mapEntry : mapList) {
if (mapEntry.type() == QVariant::Map)
storeList.append(QVariant::fromValue(storeFromMap(mapEntry.toMap())));
else if (mapEntry.type() == QVariant::List)
storeList.append(QVariant::fromValue(storeListFromMapList(mapEntry.toList())));
else
storeList.append(mapEntry);
}
return storeList;
}
static QVariantList mapListFromStoreList(const QVariantList &storeList)
{
QVariantList mapList;
for (const auto &storeEntry : storeList) {
if (storeEntry.metaType() == QMetaType::fromType<Store>())
mapList.append(QVariant::fromValue(mapFromStore(storeEntry.value<Store>())));
else if (storeEntry.type() == QVariant::List)
mapList.append(QVariant::fromValue(mapListFromStoreList(storeEntry.toList())));
else
mapList.append(storeEntry);
}
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) {
store.insert(keyFromString(it.key()), QVariant::fromValue(storeFromMap(it->toMap())));
} else if (it.value().type() == QVariant::List) {
store.insert(keyFromString(it.key()),
QVariant::fromValue(storeListFromMapList(it->toList())));
} else {
store.insert(keyFromString(it.key()), it.value());
}
}
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>())
map.insert(stringFromKey(it.key()), mapFromStore(it->value<Store>()));
else if (it.value().type() == QVariant::List)
map.insert(stringFromKey(it.key()), mapListFromStoreList(it->toList()));
else
map.insert(stringFromKey(it.key()), it.value());
}
return map;
#else
return store;
#endif
}
} // Utils

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

@@ -24,4 +24,7 @@ QTCREATOR_UTILS_EXPORT QStringList stringsFromKeys(const KeyList &list);
QTCREATOR_UTILS_EXPORT QVariant variantFromStore(const Store &store);
QTCREATOR_UTILS_EXPORT Store storeFromVariant(const QVariant &value);
QTCREATOR_UTILS_EXPORT Store storeFromMap(const QVariantMap &map);
QTCREATOR_UTILS_EXPORT QVariantMap mapFromStore(const Store &store);
} // Utils

91
src/libs/utils/storefrommap.h
View File

@@ -1,91 +0,0 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include "store.h"
namespace Utils {
#ifdef QTC_USE_STORE
inline Store storeFromMap(const QVariantMap &map);
inline QVariantMap mapFromStore(const Store &store);
inline QVariantList storeListFromMapList(const QVariantList &mapList)
{
QVariantList storeList;
for (const auto &mapEntry : mapList) {
if (mapEntry.type() == QVariant::Map)
storeList.append(QVariant::fromValue(storeFromMap(mapEntry.toMap())));
else if (mapEntry.type() == QVariant::List)
storeList.append(QVariant::fromValue(storeListFromMapList(mapEntry.toList())));
else
storeList.append(mapEntry);
}
return storeList;
}
inline QVariantList mapListFromStoreList(const QVariantList &storeList)
{
QVariantList mapList;
for (const auto &storeEntry : storeList) {
if (storeEntry.metaType() == QMetaType::fromType<Store>())
mapList.append(QVariant::fromValue(mapFromStore(storeEntry.value<Store>())));
else if (storeEntry.type() == QVariant::List)
mapList.append(QVariant::fromValue(mapListFromStoreList(storeEntry.toList())));
else
mapList.append(storeEntry);
}
return mapList;
}
inline Store storeFromMap(const QVariantMap &map)
{
Store store;
for (auto it = map.begin(); it != map.end(); ++it) {
if (it.value().type() == QVariant::Map) {
store.insert(keyFromString(it.key()), QVariant::fromValue(storeFromMap(it->toMap())));
} else if (it.value().type() == QVariant::List) {
store.insert(keyFromString(it.key()),
QVariant::fromValue(storeListFromMapList(it->toList())));
} else {
store.insert(keyFromString(it.key()), it.value());
}
}
return store;
}
inline QVariantMap mapFromStore(const Store &store)
{
QVariantMap map;
for (auto it = store.begin(); it != store.end(); ++it) {
if (it.value().metaType() == QMetaType::fromType<Store>())
map.insert(stringFromKey(it.key()), mapFromStore(it->value<Store>()));
else if (it.value().type() == QVariant::List)
map.insert(stringFromKey(it.key()), mapListFromStoreList(it->toList()));
else
map.insert(stringFromKey(it.key()), it.value());
}
return map;
}
#else
inline Store storeFromMap(const QVariantMap &map)
{
return map;
}
inline QVariantMap mapFromStore(const Store &store)
{
return store;
}
#endif
} // namespace Utils

1
src/libs/utils/utils.qbs
View File

@@ -296,7 +296,6 @@ Project {
"store.cpp",
"store.h",
"storekey.h",
"storefrommap.h",
"stringtable.cpp",
"stringtable.h",
"stringutils.cpp",