diff options
Diffstat (limited to 'src/activeqt/container/qaxobject.h')
| -rw-r--r-- | src/activeqt/container/qaxobject.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h index fc09a70..f7e16d2 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); + explicit QAxObject(QObject *parent = Q_NULLPTR); + explicit QAxObject(const QString &c, QObject *parent = Q_NULLPTR); + explicit QAxObject(IUnknown *iface, QObject *parent = Q_NULLPTR); ~QAxObject(); bool doVerb(const QString &verb); @@ -70,14 +70,14 @@ private: template <> inline QAxObject *qobject_cast<QAxObject*>(const QObject *o) { - void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxObject") : 0; - return (QAxObject*)(result); + void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxObject") : Q_NULLPTR; + return reinterpret_cast<QAxObject*>(result); } template <> inline QAxObject *qobject_cast<QAxObject*>(QObject *o) { - void *result = o ? o->qt_metacast("QAxObject") : 0; - return (QAxObject*)(result); + void *result = o ? o->qt_metacast("QAxObject") : Q_NULLPTR; + return reinterpret_cast<QAxObject*>(result); } QT_END_NAMESPACE |