1 files changed, 9 insertions, 9 deletions
diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp
index 8e0b3e4598..c80131f41d 100644
--- a/src/dbus/qdbusmarshaller.cpp
+++ b/src/dbus/qdbusmarshaller.cpp
@@ -190,14 +190,14 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg)
 
     const QVariant &value = arg.variant();
     int id = value.userType();
-    if (id == QVariant::Invalid) {
+    if (id == QMetaType::UnknownType) {
         qWarning("QDBusMarshaller: cannot add a null QDBusVariant");
         error(QLatin1String("Variant containing QVariant::Invalid passed in arguments"));
         return false;
     }
 
     QByteArray tmpSignature;
-    const char *signature = 0;
+    const char *signature = nullptr;
     if (id == QDBusMetaTypeId::argument()) {
         // take the signature from the QDBusArgument object we're marshalling
         tmpSignature =
@@ -243,7 +243,7 @@ inline void QDBusMarshaller::append(const QStringList &arg)
 
 inline QDBusMarshaller *QDBusMarshaller::beginStructure()
 {
-    return beginCommon(DBUS_TYPE_STRUCT, 0);
+    return beginCommon(DBUS_TYPE_STRUCT, nullptr);
 }
 
 inline QDBusMarshaller *QDBusMarshaller::beginArray(int id)
@@ -301,7 +301,7 @@ inline QDBusMarshaller *QDBusMarshaller::beginMap(int kid, int vid)
 
 inline QDBusMarshaller *QDBusMarshaller::beginMapEntry()
 {
-    return beginCommon(DBUS_TYPE_DICT_ENTRY, 0);
+    return beginCommon(DBUS_TYPE_DICT_ENTRY, nullptr);
 }
 
 void QDBusMarshaller::open(QDBusMarshaller &sub, int code, const char *signature)
@@ -384,7 +384,7 @@ void QDBusMarshaller::error(const QString &msg)
 bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
 {
     int id = arg.userType();
-    if (id == QVariant::Invalid) {
+    if (id == QMetaType::UnknownType) {
         qWarning("QDBusMarshaller: cannot add an invalid QVariant");
         error(QLatin1String("Variant containing QVariant::Invalid passed in arguments"));
         return false;
@@ -485,12 +485,12 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
     case DBUS_TYPE_ARRAY:
         // could be many things
         // find out what kind of array it is
-        switch (arg.type()) {
-        case QVariant::StringList:
+        switch (arg.userType()) {
+        case QMetaType::QStringList:
             append( arg.toStringList() );
             return true;
 
-        case QVariant::ByteArray:
+        case QMetaType::QByteArray:
             append( arg.toByteArray() );
             return true;
 
@@ -572,7 +572,7 @@ bool QDBusMarshaller::appendCrossMarshalling(QDBusDemarshaller *demarshaller)
 
     QDBusMarshaller mrecursed(capabilities);  // create on the stack makes it autoclose
     QByteArray subSignature;
-    const char *sig = 0;
+    const char *sig = nullptr;
     if (code == DBUS_TYPE_VARIANT || code == DBUS_TYPE_ARRAY) {
         subSignature = drecursed->currentSignature().toLatin1();
         if (!subSignature.isEmpty())