diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2016-12-05 13:50:53 +0100 |
|---|---|---|
| committer | Jesus Fernandez <jesus.fernandez@qt.io> | 2016-12-06 15:32:26 +0000 |
| commit | 3c4febf5571e2a34846e6377688676dbd034556b (patch) | |
| tree | aaf74aa6b47c2538982eeabbeab25b44bfc42d72 /src | |
| parent | 6ff4d8c61afc2ede16d60195dc30ea6538e2d5c9 (diff) | |
Fix using 0 as null pointer
Fixes: error: zero as null pointer constant.
Change-Id: I850d51075263dac6dd135d3cadc136cbd08b40ab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/qdbuspendingreply.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusreply.h | 2 | ||||
| -rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 2 |
3 files changed, 4 insertions, 4 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; diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index 2f9721b175..cdf3ad3310 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -514,7 +514,7 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf // constructors/destructors: hs << "public:" << endl - << " " << className << "(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);" << endl + << " " << className << "(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);" << endl << endl << " ~" << className << "();" << endl << endl; |