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, 8 insertions, 8 deletions

diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h
index ce5efd3..e6131d9 100644
--- a/src/activeqt/container/qaxwidget.h
+++ b/src/activeqt/container/qaxwidget.h
@@ -56,12 +56,12 @@ class QAxWidget : public QWidget, public QAxBase
 {
     Q_OBJECT_FAKE
 public:
-    QObject* qObject() const Q_DECL_OVERRIDE { return (QWidget*)this; }
+    QObject* qObject() const Q_DECL_OVERRIDE { return const_cast<QAxWidget *>(this); }
     const char *className() const Q_DECL_OVERRIDE;
 
-    QAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
-    QAxWidget(const QString &c, QWidget *parent = 0, Qt::WindowFlags f = 0);
-    QAxWidget(IUnknown *iface, QWidget *parent = 0, Qt::WindowFlags f = 0);
+    explicit QAxWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+    explicit QAxWidget(const QString &c, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+    explicit QAxWidget(IUnknown *iface, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
     ~QAxWidget();
 
     void clear() Q_DECL_OVERRIDE;
@@ -94,14 +94,14 @@ private:
 
 template <> inline QAxWidget *qobject_cast<QAxWidget*>(const QObject *o)
 {
-    void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxWidget") : 0;
-    return (QAxWidget*)(result);
+    void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxWidget") : Q_NULLPTR;
+    return static_cast<QAxWidget *>(result);
 }
 
 template <> inline QAxWidget *qobject_cast<QAxWidget*>(QObject *o)
 {
-    void *result = o ? o->qt_metacast("QAxWidget") : 0;
-    return (QAxWidget*)(result);
+    void *result = o ? o->qt_metacast("QAxWidget") : Q_NULLPTR;
+    return static_cast<QAxWidget *>(result);
 }
 
 QT_END_NAMESPACE