Fix QMetaType-related deprecation warnings

Change-Id: I562c37e04b966714424f78f20cfb0aee1ebb5254
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

4 files changed, 10 insertions, 9 deletions

diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index a26d7d4ea..f42fba6b3 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -868,7 +868,7 @@ static const char *typeName(int type)
     if (type == qMetaTypeId<PropertySheetStringValue>())
         type = QVariant::String;
     if (type < int(QVariant::UserType))
-        return QVariant::typeToName(static_cast<QVariant::Type>(type));
+        return QMetaType(type).name();
     if (type == qMetaTypeId<PropertySheetIconValue>())
         return "QIcon";
     if (type == qMetaTypeId<PropertySheetPixmapValue>())
diff --git a/src/qdbus/qdbus/qdbus.cpp b/src/qdbus/qdbus/qdbus.cpp
index c92a31e99..a4993de8d 100644
--- a/src/qdbus/qdbus/qdbus.cpp
+++ b/src/qdbus/qdbus/qdbus.cpp
@@ -332,7 +332,7 @@ static int placeCall(const QString &service, const QString &path, const QString
                     // UChar because it can't decide if it's a character or a number
                     p = QVariant::fromValue<uchar>(p.toUInt());
                 } else if (id < int(QMetaType::User) && id != int(QVariant::Map)) {
-                    p.convert(id);
+                    p.convert(QMetaType(id));
                     if (p.type() == QVariant::Invalid) {
                         fprintf(stderr, "Could not convert '%s' to type '%s'.\n",
                                 qPrintable(argument), types.at(i).constData());
diff --git a/src/qdbus/qdbusviewer/propertydialog.cpp b/src/qdbus/qdbusviewer/propertydialog.cpp
index 4892f7162..fb3949379 100644
--- a/src/qdbus/qdbusviewer/propertydialog.cpp
+++ b/src/qdbus/qdbusviewer/propertydialog.cpp
@@ -69,7 +69,7 @@ void PropertyDialog::addProperty(const QString &aname, int type)
     if (name.isEmpty())
         name = QLatin1String("argument ") + QString::number(rowCount + 1);
     name += QLatin1String(" (");
-    name += QLatin1String(QMetaType::typeName(type));
+    name += QLatin1String(QMetaType(type).name());
     name += QLatin1String(")");
     QTableWidgetItem *nameItem = new QTableWidgetItem(name);
     nameItem->setFlags(nameItem->flags() &
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index a581b55d2..3613d2db6 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -274,7 +274,7 @@ void QDBusViewer::setProperty(const BusSignature &sig)
         return;
 
     QVariant value = input;
-    if (!value.convert(prop.type())) {
+    if (!value.convert(prop.metaType())) {
         QMessageBox::warning(this, tr("Unable to marshall"),
                 tr("Value conversion failed, unable to set property"));
         return;
@@ -293,7 +293,7 @@ static QString getDbusSignature(const QMetaMethod& method)
     // create a D-Bus type signature from QMetaMethod's parameters
     QString sig;
     for (int i = 0; i < method.parameterTypes().count(); ++i) {
-        int type = QMetaType::type(method.parameterTypes().at(i));
+        const int type = QMetaType::fromName(method.parameterTypes().at(i)).id();
         sig.append(QString::fromLatin1(QDBusMetaType::typeToSignature(type)));
     }
     return sig;
@@ -330,7 +330,7 @@ void QDBusViewer::callMethod(const BusSignature &sig)
         if (paramType.endsWith('&'))
             continue; // ignore OUT parameters
 
-        int type = QMetaType::type(paramType);
+        const int type = QMetaType::fromName(paramType).id();
         dialog.addProperty(QString::fromLatin1(paramNames.value(i)), type);
         types.append(type);
     }
@@ -349,9 +349,10 @@ void QDBusViewer::callMethod(const BusSignature &sig)
     for (int i = 0; i < args.count(); ++i) {
         QVariant a = args.at(i);
         int desttype = types.at(i);
-        if (desttype < int(QMetaType::User) && desttype != int(QVariant::Map)
-            && a.canConvert(desttype)) {
-            args[i].convert(desttype);
+        if (desttype < int(QMetaType::User) && desttype != int(QVariant::Map)) {
+            const QMetaType metaType(desttype);
+            if (a.canConvert(metaType))
+                args[i].convert(metaType);
         }
         // Special case - convert a value to a QDBusVariant if the
         // interface wants a variant