summaryrefslogtreecommitdiffstats
path: root/src/activeqt/container/qaxobject.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-22 11:09:26 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-22 12:35:43 +0000
commit433cfc3907b96c4172be03c267b6cb357f896e40 (patch)
tree1637b780504c19d26aedbc37f7b12826a6132d11 /src/activeqt/container/qaxobject.h
parent093622f7945461e9d4c4559306067c2dae06a0b7 (diff)
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: Iae48c528666459ebb368cd57615f4ead4147f872 Task-number: QTBUG-45291 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/activeqt/container/qaxobject.h')
-rw-r--r--src/activeqt/container/qaxobject.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h
index 5c62303..41a8f59 100644
--- a/src/activeqt/container/qaxobject.h
+++ b/src/activeqt/container/qaxobject.h
@@ -53,9 +53,9 @@ public:
QObject* qObject() const Q_DECL_OVERRIDE { return static_cast<QObject *>(const_cast<QAxObject *>(this)); }
const char *className() const Q_DECL_OVERRIDE;
- QAxObject(QObject *parent = 0);
- QAxObject(const QString &c, QObject *parent = 0);
- QAxObject(IUnknown *iface, QObject *parent = 0);
+ QAxObject(QObject *parent = Q_NULLPTR);
+ QAxObject(const QString &c, QObject *parent = Q_NULLPTR);
+ QAxObject(IUnknown *iface, QObject *parent = Q_NULLPTR);
~QAxObject();
bool doVerb(const QString &verb);
@@ -70,13 +70,13 @@ private:
template <> inline QAxObject *qobject_cast<QAxObject*>(const QObject *o)
{
- void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxObject") : 0;
+ void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxObject") : Q_NULLPTR;
return (QAxObject*)(result);
}
template <> inline QAxObject *qobject_cast<QAxObject*>(QObject *o)
{
- void *result = o ? o->qt_metacast("QAxObject") : 0;
+ void *result = o ? o->qt_metacast("QAxObject") : Q_NULLPTR;
return (QAxObject*)(result);
}