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

Fix QMetaType::type() related deprecation warnings in sdktool

Browse Source 
Change-Id: I758d9514d22dbd155232fed8e8293cff755b914d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-05-23 12:17:04 +02:00
parent f2f514d8f1
commit 969434342b
7 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/sdktool/addkitoperation.cpp
View File

@@ -438,7 +438,7 @@ void AddKitOperation::unittest()
QVERIFY(profile0.contains(ICON));
QCOMPARE(profile0.value(ICON).toString(), "/tmp/icon.png");
QVERIFY(profile0.contains(DATA));
QCOMPARE(profile0.value(DATA).type(), QVariant::Map);
QCOMPARE(profile0.value(DATA).typeId(), QMetaType::QVariantMap);
QVERIFY(profile0.contains(AUTODETECTED));
QCOMPARE(profile0.value(AUTODETECTED).toBool(), true);
QVERIFY(profile0.contains(SDK));
@@ -447,7 +447,7 @@ void AddKitOperation::unittest()
QVariantMap data = profile0.value(DATA).toMap();
QCOMPARE(data.count(), 7);
QVERIFY(data.contains(DEBUGGER));
QCOMPARE(data.value(DEBUGGER).type(), QVariant::Map);
QCOMPARE(data.value(DEBUGGER).typeId(), QMetaType::QVariantMap);
QVERIFY(data.contains(DEVICE_TYPE));
QCOMPARE(data.value(DEVICE_TYPE).toString(), "Desktop");
QVERIFY(data.contains(TOOLCHAIN));
@@ -505,7 +505,7 @@ void AddKitOperation::unittest()
QVERIFY(profile1.contains(ICON));
QCOMPARE(profile1.value(ICON).toString(), "/tmp/icon2.png");
QVERIFY(profile1.contains(DATA));
QCOMPARE(profile1.value(DATA).type(), QVariant::Map);
QCOMPARE(profile1.value(DATA).typeId(), QMetaType::QVariantMap);
QVERIFY(profile1.contains(AUTODETECTED));
QCOMPARE(profile1.value(AUTODETECTED).toBool(), true);
QVERIFY(profile1.contains(SDK));
@@ -514,7 +514,7 @@ void AddKitOperation::unittest()
data = profile1.value(DATA).toMap();
QCOMPARE(data.count(), 9);
QVERIFY(data.contains(DEBUGGER));
QCOMPARE(data.value(DEBUGGER).type(), QVariant::Map);
QCOMPARE(data.value(DEBUGGER).typeId(), QMetaType::QVariantMap);
QVERIFY(data.contains(DEVICE_TYPE));
QCOMPARE(data.value(DEVICE_TYPE).toString(), "Desktop");
QVERIFY(data.contains(DEVICE_ID));
@@ -567,7 +567,7 @@ void AddKitOperation::unittest()
QVERIFY(profile2.contains(ICON));
QCOMPARE(profile2.value(ICON).toString(), "/tmp/icon2.png");
QVERIFY(profile2.contains(DATA));
QCOMPARE(profile2.value(DATA).type(), QVariant::Map);
QCOMPARE(profile2.value(DATA).typeId(), QMetaType::QVariantMap);
QVERIFY(profile2.contains(AUTODETECTED));
QCOMPARE(profile2.value(AUTODETECTED).toBool(), true);
QVERIFY(profile2.contains(SDK));

2
src/tools/sdktool/addvalueoperation.cpp
View File

@@ -164,7 +164,7 @@ bool AddValueData::appendListToMap(QVariantMap &map) const
return false;
}
if (data.type() != QVariant::List) {
if (data.typeId() != QMetaType::QVariantList) {
qCCritical(addvaluelog) << "Error: Data stored in" << m_key
<< "is not a QVariantList.";
return false;

4
src/tools/sdktool/findkeyoperation.cpp
View File

@@ -116,7 +116,7 @@ void FindKeyOperation::unittest()
QStringList FindKeyOperation::findKey(const QVariant &in, const QString &key, const QString &prefix)
{
QStringList result;
if (in.type() == QVariant::Map) {
if (in.typeId() == QMetaType::QVariantMap) {
const QVariantMap map = in.toMap();
for (QVariantMap::const_iterator i = map.begin(); i != map.end(); ++i) {
QString pfx = prefix;
@@ -129,7 +129,7 @@ QStringList FindKeyOperation::findKey(const QVariant &in, const QString &key, co
result.append(findKey(i.value(), key, pfx));
}
}
} else if (in.type() == QVariant::List) {
} else if (in.typeId() == QMetaType::QVariantList) {
QVariantList list = in.toList();
for (int pos = 0; pos < list.count(); ++pos) {
QString pfx = prefix + QLatin1Char('[') + QString::number(pos) + QLatin1Char(']');

6
src/tools/sdktool/findvalueoperation.cpp
View File

@@ -122,9 +122,9 @@ QStringList FindValueOperation::findValue(const QVariant &in, const QVariant &va
const QString &prefix)
{
QStringList result;
if (in.type() == value.type() && in == value) {
if (in.typeId() == value.typeId() && in == value) {
result << prefix;
} else if (in.type() == QVariant::Map) {
} else if (in.typeId() == QMetaType::QVariantMap) {
const QVariantMap map = in.toMap();
for (QVariantMap::const_iterator i = map.begin(); i != map.end(); ++i) {
QString pfx = prefix;
@@ -133,7 +133,7 @@ QStringList FindValueOperation::findValue(const QVariant &in, const QVariant &va
pfx.append(i.key());
result.append(findValue(i.value(), value, pfx));
}
} else if (in.type() == QVariant::List) {
} else if (in.typeId() == QMetaType::QVariantList) {
QVariantList list = in.toList();
for (int pos = 0; pos < list.count(); ++pos) {
QString pfx = prefix + QLatin1Char('[') + QString::number(pos) + QLatin1Char(']');

14
src/tools/sdktool/getoperation.cpp
View File

@@ -48,16 +48,16 @@ bool GetOperation::setArguments(const QStringList &args)
static QString toString(const QVariant &variant, int indentation = 0)
{
const QString indent(indentation, QLatin1Char(' '));
switch (variant.type()) {
case QVariant::Map: {
switch (variant.typeId()) {
case QMetaType::QVariantMap: {
QVariantMap map = variant.toMap();
QString res;
for (auto item = map.begin(); item != map.end(); ++item) {
res += indent + item.key() + QLatin1String(": ");
QVariant value = item.value();
switch (value.type()) {
case QVariant::Map:
case QVariant::List:
switch (value.typeId()) {
case QMetaType::QVariantMap:
case QMetaType::QVariantList:
res += QLatin1Char('\n') + toString(value, indentation + 1);
break;
default:
@@ -68,7 +68,7 @@ static QString toString(const QVariant &variant, int indentation = 0)
}
return res;
}
case QVariant::List: {
case QMetaType::QVariantList: {
const QVariantList list = variant.toList();
QString res;
int counter = 0;
@@ -119,7 +119,7 @@ void GetOperation::unittest()
QCOMPARE(result.toString(), QLatin1String("true"));
result = get(testMap, QLatin1String("subkeys/subsubkeys"));
QCOMPARE(result.type(), QVariant::Map);
QCOMPARE(result.typeId(), QMetaType::QVariantMap);
result = get(testMap, QLatin1String("nonexistant"));
QVERIFY(!result.isValid());

2
src/tools/sdktool/rmdeviceoperation.cpp
View File

@@ -81,7 +81,7 @@ QVariantMap RmDeviceOperation::rmDevice(const QVariantMap &map, const QString &i
QVariantList devList = GetOperation::get(dmMap, QLatin1String(DEVICE_LIST_ID)).toList();
for (int i = 0; i < devList.count(); ++i) {
QVariant value = devList.at(i);
if (value.type() != QVariant::Map)
if (value.typeId() != QMetaType::QVariantMap)
continue;
QVariantMap deviceData = value.toMap();
QString devId = deviceData.value(QLatin1String(DEVICE_ID_ID)).toString();

48
src/tools/sdktool/sdkpersistentsettings.cpp
View File

@@ -503,13 +503,13 @@ struct Context // Basic context containing element name string constants.
struct ParseValueStackEntry
{
explicit ParseValueStackEntry(QVariant::Type t = QVariant::Invalid, const QString &k = QString()) : type(t), key(k) {}
explicit ParseValueStackEntry(int t = QMetaType::UnknownType, const QString &k = QString()) : 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;
int typeId;
QString key;
QVariant simpleValue;
QVariantList listValue;
@@ -517,19 +517,19 @@ struct ParseValueStackEntry
};
ParseValueStackEntry::ParseValueStackEntry(const QVariant &aSimpleValue, const QString &k) :
type(aSimpleValue.type()), key(k), simpleValue(aSimpleValue)
typeId(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;
@@ -539,16 +539,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;
}
}
@@ -643,10 +643,10 @@ bool ParseContext::handleStartElement(QXmlStreamReader &r)
return handleEndElement(name);
}
case ListValueElement:
m_valueStack.push_back(ParseValueStackEntry(QVariant::List, key));
m_valueStack.push_back(ParseValueStackEntry(QMetaType::QVariantList, key));
break;
case MapValueElement:
m_valueStack.push_back(ParseValueStackEntry(QVariant::Map, key));
m_valueStack.push_back(ParseValueStackEntry(QMetaType::QVariantMap, key));
break;
default:
break;
@@ -715,7 +715,7 @@ QVariant ParseContext::readSimpleValue(QXmlStreamReader &r, const QXmlStreamAttr
}
QVariant value;
value.setValue(text);
value.convert(QMetaType::type(type.toLatin1().constData()));
value.convert(QMetaType::fromName(type.toLatin1()));
return value;
}
@@ -760,11 +760,11 @@ bool SdkPersistentSettingsReader::load(const QString &fileName)
static void writeVariantValue(QXmlStreamWriter &w, const Context &ctx,
const QVariant &variant, const QString &key = QString())
{
switch (static_cast<int>(variant.type())) {
case static_cast<int>(QVariant::StringList):
case static_cast<int>(QVariant::List): {
switch (variant.typeId()) {
case QMetaType::QStringList:
case QMetaType::QVariantList: {
w.writeStartElement(ctx.valueListElement);
w.writeAttribute(ctx.typeAttribute, QLatin1String(QVariant::typeToName(QVariant::List)));
w.writeAttribute(ctx.typeAttribute, QLatin1String(QMetaType(QMetaType::QVariantList).name()));
if (!key.isEmpty())
w.writeAttribute(ctx.keyAttribute, key);
const QList<QVariant> list = variant.toList();
@@ -773,9 +773,9 @@ static void writeVariantValue(QXmlStreamWriter &w, const Context &ctx,
w.writeEndElement();
break;
}
case static_cast<int>(QVariant::Map): {
case QMetaType::QVariantMap: {
w.writeStartElement(ctx.valueMapElement);
w.writeAttribute(ctx.typeAttribute, QLatin1String(QVariant::typeToName(QVariant::Map)));
w.writeAttribute(ctx.typeAttribute, QLatin1String(QMetaType(QMetaType::QVariantMap).name()));
if (!key.isEmpty())
w.writeAttribute(ctx.keyAttribute, key);
const QVariantMap varMap = variant.toMap();
@@ -785,16 +785,16 @@ static void writeVariantValue(QXmlStreamWriter &w, const Context &ctx,
w.writeEndElement();
}
break;
case static_cast<int>(QMetaType::QObjectStar): // ignore QObjects!
case static_cast<int>(QMetaType::VoidStar): // ignore void pointers!
case QMetaType::QObjectStar: // ignore QObjects!
case QMetaType::VoidStar: // ignore void pointers!
break;
default:
w.writeStartElement(ctx.valueElement);
w.writeAttribute(ctx.typeAttribute, QLatin1String(variant.typeName()));
if (!key.isEmpty())
w.writeAttribute(ctx.keyAttribute, key);
switch (variant.type()) {
case QVariant::Rect:
switch (variant.typeId()) {
case QMetaType::QRect:
w.writeCharacters(rectangleToString(variant.toRect()));
break;
default: