diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:11:15 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 10:32:55 +0000 |
commit | a767014167d4f7b258a2bd83637dc1ef25b364f0 (patch) | |
tree | dec849a76c2109cd3dff1d0b3b51c3fe85a91b3e /src/gui/accessible | |
parent | 08f6b38ec72f9358ce0f6270034b5a8a4baf2e14 (diff) |
QtGui: Use Q_NULLPTR instead of 0 in all public headers
This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.
Task-number: QTBUG-45291
Change-Id: I72ab40b21a9499b53a639564fa45884de17b6c98
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/accessible')
-rw-r--r-- | src/gui/accessible/qaccessible.h | 4 | ||||
-rw-r--r-- | src/gui/accessible/qaccessiblebridge.h | 2 | ||||
-rw-r--r-- | src/gui/accessible/qaccessibleplugin.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index a40d7209c3..63658260fc 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -505,7 +505,7 @@ public: virtual void virtual_hook(int id, void *data); virtual void *interface_cast(QAccessible::InterfaceType) - { return 0; } + { return Q_NULLPTR; } protected: friend class QAccessibleCache; @@ -676,7 +676,7 @@ public: } inline QAccessibleEvent(QAccessibleInterface *iface, QAccessible::Event typ) - : m_type(typ), m_object(0) + : m_type(typ), m_object(Q_NULLPTR) { Q_ASSERT(iface); Q_ASSERT(m_type != QAccessible::ValueChanged); diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h index f0df5e1f39..277a8d201b 100644 --- a/src/gui/accessible/qaccessiblebridge.h +++ b/src/gui/accessible/qaccessiblebridge.h @@ -59,7 +59,7 @@ class Q_GUI_EXPORT QAccessibleBridgePlugin : public QObject { Q_OBJECT public: - explicit QAccessibleBridgePlugin(QObject *parent = 0); + explicit QAccessibleBridgePlugin(QObject *parent = Q_NULLPTR); ~QAccessibleBridgePlugin(); virtual QAccessibleBridge *create(const QString &key) = 0; diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h index a4b782af11..44261788c7 100644 --- a/src/gui/accessible/qaccessibleplugin.h +++ b/src/gui/accessible/qaccessibleplugin.h @@ -53,7 +53,7 @@ class Q_GUI_EXPORT QAccessiblePlugin : public QObject { Q_OBJECT public: - explicit QAccessiblePlugin(QObject *parent = 0); + explicit QAccessiblePlugin(QObject *parent = Q_NULLPTR); ~QAccessiblePlugin(); virtual QAccessibleInterface *create(const QString &key, QObject *object) = 0; |