1 files changed, 12 insertions, 12 deletions

diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp
index dc94897ac4..b4ee6811ac 100644
--- a/src/dbus/qdbusutil.cpp
+++ b/src/dbus/qdbusutil.cpp
@@ -82,7 +82,7 @@ static bool variantToString(const QVariant &arg, QString &out)
 {
     int argType = arg.userType();
 
-    if (argType == QVariant::StringList) {
+    if (argType == QMetaType::QStringList) {
         out += QLatin1Char('{');
         const QStringList list = arg.toStringList();
         for (const QString &item : list)
@@ -90,7 +90,7 @@ static bool variantToString(const QVariant &arg, QString &out)
         if (!list.isEmpty())
             out.chop(2);
         out += QLatin1Char('}');
-    } else if (argType == QVariant::ByteArray) {
+    } else if (argType == QMetaType::QByteArray) {
         out += QLatin1Char('{');
         QByteArray list = arg.toByteArray();
         for (int i = 0; i < list.count(); ++i) {
@@ -100,7 +100,7 @@ static bool variantToString(const QVariant &arg, QString &out)
         if (!list.isEmpty())
             out.chop(2);
         out += QLatin1Char('}');
-    } else if (argType == QVariant::List) {
+    } else if (argType == QMetaType::QVariantList) {
         out += QLatin1Char('{');
         const QList<QVariant> list = arg.toList();
         for (const QVariant &item : list) {
@@ -148,7 +148,7 @@ static bool variantToString(const QVariant &arg, QString &out)
         if (!variantToString(v, out))
             return false;
         out += QLatin1Char(']');
-    } else if (arg.canConvert(QVariant::String)) {
+    } else if (arg.canConvert(QMetaType::QString)) {
         out += QLatin1Char('\"') + arg.toString() + QLatin1Char('\"');
     } else {
         out += QLatin1Char('[');
@@ -246,12 +246,12 @@ static const char fixedTypes[] =         "ybnqiuxtdh";
 
 static bool isBasicType(int c)
 {
-    return c != DBUS_TYPE_INVALID && strchr(basicTypes, c) != NULL;
+    return c != DBUS_TYPE_INVALID && strchr(basicTypes, c) != nullptr;
 }
 
 static bool isFixedType(int c)
 {
-    return c != DBUS_TYPE_INVALID && strchr(fixedTypes, c) != NULL;
+    return c != DBUS_TYPE_INVALID && strchr(fixedTypes, c) != nullptr;
 }
 
 // Returns a pointer to one-past-end of this type if it's valid;
@@ -260,10 +260,10 @@ static const char *validateSingleType(const char *signature)
 {
     char c = *signature;
     if (c == DBUS_TYPE_INVALID)
-        return 0;
+        return nullptr;
 
     // is it one of the one-letter types?
-    if (strchr(oneLetterTypes, c) != NULL)
+    if (strchr(oneLetterTypes, c) != nullptr)
         return signature + 1;
 
     // is it an array?
@@ -277,9 +277,9 @@ static const char *validateSingleType(const char *signature)
             // and a free value
             c = *++signature;
             if (!isBasicType(c))
-                return 0;
+                return nullptr;
             signature = validateSingleType(signature + 1);
-            return signature && *signature == DBUS_DICT_ENTRY_END_CHAR ? signature + 1 : 0;
+            return signature && *signature == DBUS_DICT_ENTRY_END_CHAR ? signature + 1 : nullptr;
         }
 
         return validateSingleType(signature);
@@ -291,14 +291,14 @@ static const char *validateSingleType(const char *signature)
         while (true) {
             signature = validateSingleType(signature);
             if (!signature)
-                return 0;
+                return nullptr;
             if (*signature == DBUS_STRUCT_END_CHAR)
                 return signature + 1;
         }
     }
 
     // invalid/unknown type
-    return 0;
+    return nullptr;
 }
 
 /*!