diff options
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbuspendingreply.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusreply.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 786eab2120..da29894d15 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -77,7 +77,7 @@ namespace QDBusPendingReplyTypes { typedef T1 Type; }; - template<typename T1> inline int metaTypeFor(T1 * = 0) + template<typename T1> inline int metaTypeFor(T1 * = nullptr) { return qMetaTypeId<T1>(); } // specialize for QVariant, allowing it to be used in place of QDBusVariant template<> inline int metaTypeFor<QVariant>(QVariant *) @@ -91,7 +91,7 @@ namespace QDBusPendingReplyTypes { enum { Total = Next::Total + 1 }; static inline void fillMetaTypes(int *p) { - *p = metaTypeFor<T1>(0); + *p = metaTypeFor<T1>(nullptr); Next::fillMetaTypes(++p); } }; diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index b6a454d240..227615024a 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -66,7 +66,7 @@ public: } inline QDBusReply& operator=(const QDBusMessage &reply) { - QVariant data(qMetaTypeId<Type>(), reinterpret_cast<void*>(0)); + QVariant data(qMetaTypeId<Type>(), nullptr); qDBusReplyFill(reply, m_error, data); m_data = qvariant_cast<Type>(data); return *this; |