Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Conflicts:
	src/activeqt/container/qaxwidget.h

Change-Id: Ic6e7267fc71e3ace14e75b392ad3f7cac0df41a1

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