diff options
-rw-r--r-- | src/dbus/qdbusargument.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusinterface.h | 2 | ||||
-rw-r--r-- | src/dbus/qdbuspendingcall.h | 2 | ||||
-rw-r--r-- | src/dbus/qdbusreply.h | 2 | ||||
-rw-r--r-- | src/dbus/qdbusserver.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusservicewatcher.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusvirtualobject.h | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 42b266792a..6d34a8d226 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -147,7 +147,7 @@ QT_BEGIN_NAMESPACE template<typename T> inline T qdbus_cast(const QDBusArgument &arg #ifndef Q_QDOC -, T * = 0 +, T * = Q_NULLPTR #endif ) { @@ -158,7 +158,7 @@ template<typename T> inline T qdbus_cast(const QDBusArgument &arg template<typename T> inline T qdbus_cast(const QVariant &v #ifndef Q_QDOC -, T * = 0 +, T * = Q_NULLPTR #endif ) { diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index b63df10763..b48a206644 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -52,7 +52,7 @@ private: public: QDBusInterface(const QString &service, const QString &path, const QString &interface = QString(), const QDBusConnection &connection = QDBusConnection::sessionBus(), - QObject *parent = 0); + QObject *parent = Q_NULLPTR); ~QDBusInterface(); virtual const QMetaObject *metaObject() const Q_DECL_OVERRIDE; diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 8bca64cd9a..3bcacffd22 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -96,7 +96,7 @@ class Q_DBUS_EXPORT QDBusPendingCallWatcher: public QObject, public QDBusPending { Q_OBJECT public: - explicit QDBusPendingCallWatcher(const QDBusPendingCall &call, QObject *parent = 0); + explicit QDBusPendingCallWatcher(const QDBusPendingCall &call, QObject *parent = Q_NULLPTR); ~QDBusPendingCallWatcher(); #ifdef Q_QDOC diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 56830f698a..4cfe8db161 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -125,7 +125,7 @@ private: template<> inline QDBusReply<QVariant>& QDBusReply<QVariant>::operator=(const QDBusMessage &reply) { - void *null = 0; + void *null = Q_NULLPTR; QVariant data(qMetaTypeId<QDBusVariant>(), null); qDBusReplyFill(reply, m_error, data); m_data = qvariant_cast<QDBusVariant>(data).variant(); diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index cdd531802a..db21f268b0 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -50,8 +50,8 @@ class Q_DBUS_EXPORT QDBusServer: public QObject { Q_OBJECT public: - explicit QDBusServer(const QString &address, QObject *parent = 0); - explicit QDBusServer(QObject *parent = 0); + explicit QDBusServer(const QString &address, QObject *parent = Q_NULLPTR); + explicit QDBusServer(QObject *parent = Q_NULLPTR); virtual ~QDBusServer(); bool isConnected() const; diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index 020ce13c30..6f6ce917af 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -58,9 +58,9 @@ public: }; Q_DECLARE_FLAGS(WatchMode, WatchModeFlag) - explicit QDBusServiceWatcher(QObject *parent = 0); + explicit QDBusServiceWatcher(QObject *parent = Q_NULLPTR); QDBusServiceWatcher(const QString &service, const QDBusConnection &connection, - WatchMode watchMode = WatchForOwnerChange, QObject *parent = 0); + WatchMode watchMode = WatchForOwnerChange, QObject *parent = Q_NULLPTR); ~QDBusServiceWatcher(); QStringList watchedServices() const; diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index 469c41f363..740c5f712e 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -51,7 +51,7 @@ class Q_DBUS_EXPORT QDBusVirtualObject : public QObject { Q_OBJECT public: - explicit QDBusVirtualObject(QObject *parent = 0); + explicit QDBusVirtualObject(QObject *parent = Q_NULLPTR); virtual ~QDBusVirtualObject(); virtual QString introspect(const QString &path) const = 0; |