diff options
Diffstat (limited to 'src/dbus/qdbusmisc.cpp')
-rw-r--r-- | src/dbus/qdbusmisc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp index ce1546db92..25edac8025 100644 --- a/src/dbus/qdbusmisc.cpp +++ b/src/dbus/qdbusmisc.cpp @@ -62,7 +62,7 @@ bool qDBusCheckAsyncTag(const char *tag) return false; const char *p = strstr(tag, noReplyTag); - if (p != NULL && + if (p != nullptr && (p == tag || *(p-1) == ' ') && (p[sizeof noReplyTag - 1] == '\0' || p[sizeof noReplyTag - 1] == ' ')) return true; @@ -167,7 +167,7 @@ int qDBusParametersForMethod(const QList<QByteArray> ¶meterTypes, QVector<in if (id == 0) { errorMsg = QLatin1String("Unregistered output type in parameter list: ") + QLatin1String(type); return -1; - } else if (QDBusMetaType::typeToSignature(id) == 0) + } else if (QDBusMetaType::typeToSignature(id) == nullptr) return -1; metaTypes.append( id ); @@ -198,7 +198,7 @@ int qDBusParametersForMethod(const QList<QByteArray> ¶meterTypes, QVector<in if (id == QDBusMetaTypeId::message()) seenMessage = true; - else if (QDBusMetaType::typeToSignature(id) == 0) { + else if (QDBusMetaType::typeToSignature(id) == nullptr) { errorMsg = QLatin1String("Type not registered with QtDBus in parameter list: ") + QLatin1String(type); return -1; } |