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

Fix QMetaType::type() related deprecation warnings

Browse Source 
Not in sdktool, which still builds with Qt 5.15

Change-Id: I6e6f4331127b821e471e2840e7959cd65e6419e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-05-23 09:37:34 +02:00
parent af3ab760ad
commit f30d369b99
62 changed files with 295 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libs/utils/persistentsettings.cpp
View File

@@ -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: