aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/qmljs/jsoncheck.cpp14
-rw-r--r--src/libs/sqlite/sqlitevalue.h14
-rw-r--r--src/libs/utils/filepath.cpp2
-rw-r--r--src/libs/utils/macroexpander.cpp2
-rw-r--r--src/libs/utils/persistentsettings.cpp30
-rw-r--r--src/libs/utils/store.cpp6
-rw-r--r--src/libs/utils/treemodel.cpp6
-rw-r--r--src/libs/utils/wizard.cpp4
8 files changed, 39 insertions, 39 deletions
diff --git a/src/libs/qmljs/jsoncheck.cpp b/src/libs/qmljs/jsoncheck.cpp
index 1d7c04e50cf..3cb44111f9d 100644
--- a/src/libs/qmljs/jsoncheck.cpp
+++ b/src/libs/qmljs/jsoncheck.cpp
@@ -447,7 +447,7 @@ JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool)
{
switch (variant.typeId()) {
- case QVariant::List: {
+ case QMetaType::QVariantList: {
auto newValue = new (pool) JsonArrayValue;
const QList<QVariant> list = variant.toList();
for (const QVariant &element : list)
@@ -455,7 +455,7 @@ JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool)
return newValue;
}
- case QVariant::Map: {
+ case QMetaType::QVariantMap: {
auto newValue = new (pool) JsonObjectValue;
const QVariantMap variantMap = variant.toMap();
for (QVariantMap::const_iterator it = variantMap.begin(); it != variantMap.end(); ++it)
@@ -463,19 +463,19 @@ JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool)
return newValue;
}
- case QVariant::String:
+ case QMetaType::QString:
return new (pool) JsonStringValue(variant.toString());
- case QVariant::Int:
+ case QMetaType::Int:
return new (pool) JsonIntValue(variant.toInt());
- case QVariant::Double:
+ case QMetaType::Double:
return new (pool) JsonDoubleValue(variant.toDouble());
- case QVariant::Bool:
+ case QMetaType::Bool:
return new (pool) JsonBooleanValue(variant.toBool());
- case QVariant::Invalid:
+ case QMetaType::UnknownType:
return new (pool) JsonNullValue;
default:
diff --git a/src/libs/sqlite/sqlitevalue.h b/src/libs/sqlite/sqlitevalue.h
index 725682494bd..7adadb43b35 100644
--- a/src/libs/sqlite/sqlitevalue.h
+++ b/src/libs/sqlite/sqlitevalue.h
@@ -373,18 +373,18 @@ private:
if (value.isNull())
return VariantType{NullValue{}};
- switch (value.userType()) {
- case QVariant::Int:
+ switch (value.typeId()) {
+ case QMetaType::Int:
return VariantType{static_cast<long long>(value.toInt())};
- case QVariant::LongLong:
+ case QMetaType::LongLong:
return VariantType{value.toLongLong()};
- case QVariant::UInt:
+ case QMetaType::UInt:
return VariantType{static_cast<long long>(value.toUInt())};
- case QVariant::Double:
+ case QMetaType::Double:
return VariantType{value.toFloat()};
- case QVariant::String:
+ case QMetaType::QString:
return VariantType{value.toString()};
- case QVariant::ByteArray:
+ case QMetaType::QByteArray:
return VariantType{Blob{value.toByteArray()}};
default:
throw CannotConvert();
diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index b62f222475c..0965a52b1f3 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -1367,7 +1367,7 @@ FilePath FilePath::fromUtf8(const char *filename, int filenameSize)
FilePath FilePath::fromSettings(const QVariant &variant)
{
- if (variant.type() == QVariant::Url) {
+ if (variant.typeId() == QMetaType::QUrl) {
const QUrl url = variant.toUrl();
return FilePath::fromParts(url.scheme(), url.host(), url.path());
}
diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp
index dd57cd6b5a0..fc138974745 100644
--- a/src/libs/utils/macroexpander.cpp
+++ b/src/libs/utils/macroexpander.cpp
@@ -284,7 +284,7 @@ QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const
QVariant MacroExpander::expandVariant(const QVariant &v) const
{
- const auto type = QMetaType::Type(v.type());
+ const int type = v.typeId();
if (type == QMetaType::QString) {
return expand(v.toString());
} else if (type == QMetaType::QStringList) {
diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index 54a829004b3..3702ecf960b 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -106,13 +106,13 @@ const QString keyAttribute("key");
struct ParseValueStackEntry
{
- explicit ParseValueStackEntry(QVariant::Type t = QVariant::Invalid, const QString &k = {}) : type(t), key(k) {}
+ explicit ParseValueStackEntry(QMetaType::Type t = QMetaType::UnknownType, const QString &k = {}) : typeId(t), key(k) {}
explicit ParseValueStackEntry(const QVariant &aSimpleValue, const QString &k);
QVariant value() const;
void addChild(const QString &key, const QVariant &v);
- QVariant::Type type;
+ QMetaType::Type typeId;
QString key;
QVariant simpleValue;
QVariantList listValue;
@@ -120,19 +120,19 @@ struct ParseValueStackEntry
};
ParseValueStackEntry::ParseValueStackEntry(const QVariant &aSimpleValue, const QString &k)
- : type(aSimpleValue.type()), key(k), simpleValue(aSimpleValue)
+ : typeId(QMetaType::Type(aSimpleValue.typeId())), key(k), simpleValue(aSimpleValue)
{
QTC_ASSERT(simpleValue.isValid(), return);
}
QVariant ParseValueStackEntry::value() const
{
- switch (type) {
- case QVariant::Invalid:
+ switch (typeId) {
+ case QMetaType::UnknownType:
return QVariant();
- case QVariant::Map:
+ case QMetaType::QVariantMap:
return QVariant(mapValue);
- case QVariant::List:
+ case QMetaType::QVariantList:
return QVariant(listValue);
default:
break;
@@ -142,16 +142,16 @@ QVariant ParseValueStackEntry::value() const
void ParseValueStackEntry::addChild(const QString &key, const QVariant &v)
{
- switch (type) {
- case QVariant::Map:
+ switch (typeId) {
+ case QMetaType::QVariantMap:
mapValue.insert(key, v);
break;
- case QVariant::List:
+ case QMetaType::QVariantList:
listValue.push_back(v);
break;
default:
qWarning() << "ParseValueStackEntry::Internal error adding " << key << v << " to "
- << QVariant::typeToName(type) << value();
+ << QMetaType(typeId).name() << value();
break;
}
}
@@ -226,14 +226,14 @@ bool ParseContext::handleStartElement(QXmlStreamReader &r)
const QXmlStreamAttributes attributes = r.attributes();
const QString key = attributes.hasAttribute(keyAttribute) ?
attributes.value(keyAttribute).toString() : QString();
- m_valueStack.push_back(ParseValueStackEntry(QVariant::List, key));
+ m_valueStack.push_back(ParseValueStackEntry(QMetaType::QVariantList, key));
return false;
}
if (name == valueMapElement) {
const QXmlStreamAttributes attributes = r.attributes();
const QString key = attributes.hasAttribute(keyAttribute) ?
attributes.value(keyAttribute).toString() : QString();
- m_valueStack.push_back(ParseValueStackEntry(QVariant::Map, key));
+ m_valueStack.push_back(ParseValueStackEntry(QMetaType::QVariantMap, key));
return false;
}
return false;
@@ -369,8 +369,8 @@ static void writeVariantValue(QXmlStreamWriter &w, const QVariant &variant, cons
w.writeAttribute(typeAttribute, QLatin1String(variant.typeName()));
if (!key.isEmpty())
w.writeAttribute(keyAttribute, xmlAttrFromKey(key));
- switch (variant.type()) {
- case QVariant::Rect:
+ switch (variant.typeId()) {
+ case QMetaType::QRect:
w.writeCharacters(rectangleToString(variant.toRect()));
break;
default:
diff --git a/src/libs/utils/store.cpp b/src/libs/utils/store.cpp
index fa8d4232c02..8c0e2a6046a 100644
--- a/src/libs/utils/store.cpp
+++ b/src/libs/utils/store.cpp
@@ -50,10 +50,10 @@ static QVariantList mapListFromStoreList(const QVariantList &storeList);
QVariant storeEntryFromMapEntry(const QVariant &mapEntry)
{
- if (mapEntry.type() == QVariant::Map)
+ if (mapEntry.typeId() == QMetaType::QVariantMap)
return QVariant::fromValue(storeFromMap(mapEntry.toMap()));
- if (mapEntry.type() == QVariant::List)
+ if (mapEntry.typeId() == QMetaType::QVariantList)
return QVariant::fromValue(storeListFromMapList(mapEntry.toList()));
return mapEntry;
@@ -64,7 +64,7 @@ QVariant mapEntryFromStoreEntry(const QVariant &storeEntry)
if (storeEntry.metaType() == QMetaType::fromType<Store>())
return QVariant::fromValue(mapFromStore(storeEntry.value<Store>()));
- if (storeEntry.type() == QVariant::List)
+ if (storeEntry.typeId() == QMetaType::QVariantList)
return QVariant::fromValue(mapListFromStoreList(storeEntry.toList()));
return storeEntry;
diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp
index 4649bb43c86..edddb2d484e 100644
--- a/src/libs/utils/treemodel.cpp
+++ b/src/libs/utils/treemodel.cpp
@@ -459,13 +459,13 @@ void ModelTest::data()
// General Purpose roles that should return a QString
QVariant variant = model->data(model->index(0, 0), Qt::ToolTipRole);
if (variant.isValid())
- Q_ASSERT(variant.canConvert(QVariant::String));
+ Q_ASSERT(variant.canConvert(QMetaType::QString));
variant = model->data(model->index(0, 0), Qt::StatusTipRole);
if (variant.isValid())
- Q_ASSERT(variant.canConvert(QVariant::String));
+ Q_ASSERT(variant.canConvert(QMetaType::QString));
variant = model->data(model->index(0, 0), Qt::WhatsThisRole);
if (variant.isValid())
- Q_ASSERT(variant.canConvert(QVariant::String));
+ Q_ASSERT(variant.canConvert(QMetaType::QString));
// General Purpose roles that should return a QSize
variant = model->data(model->index(0, 0), Qt::SizeHintRole);
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp
index 10d801c5214..f611d512319 100644
--- a/src/libs/utils/wizard.cpp
+++ b/src/libs/utils/wizard.cpp
@@ -365,8 +365,8 @@ QHash<QString, QVariant> Wizard::variables() const
QString typeOf(const QVariant &v)
{
QString result;
- switch (v.type()) {
- case QVariant::Map:
+ switch (v.typeId()) {
+ case QMetaType::QVariantMap:
result = QLatin1String("Object");
break;
default:
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 02:23:32 +0000