diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-09 01:00:35 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-12-09 10:16:01 +0100 |
| commit | bef74b6c3a0a9c8649ea8eb333d80015f76863e4 (patch) | |
| tree | 41cdf5b6776c90a6d04a1d6680f4d47a90593746 /src/dbus/qdbusargument.cpp | |
| parent | f8d2975b6a8b36bf8dd304c99783947a72081b79 (diff) | |
| parent | 4c3c63d4cbb81b38e88e06b72749e7e01497b6f1 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1
Diffstat (limited to 'src/dbus/qdbusargument.cpp')
| -rw-r--r-- | src/dbus/qdbusargument.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 764bc24165..5a0f0f013b 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -74,11 +74,11 @@ QByteArray QDBusArgumentPrivate::createSignature(int id) marshaller->ba = &signature; // run it - void *null = 0; + void *null = nullptr; QVariant v(id, null); QDBusArgument arg(marshaller); QDBusMetaType::marshall(arg, v.userType(), v.constData()); - arg.d = 0; + arg.d = nullptr; // delete it bool ok = marshaller->ok; @@ -290,7 +290,7 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d) QDBusArgument::QDBusArgument() { if (!qdbus_loadLibDBus()) { - d = 0; + d = nullptr; return; } |