Deprecate constructing QFlags from a pointer

This was used to support QFlags f = 0 initialization, but with 0 used
as a pointer literal now considered bad form, it had been changed many
places to QFlags f = nullptr, which is meaningless and confusing.

Change-Id: I4bc592151c255dc5cab1a232615caecc520f02e8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

8 files changed, 14 insertions, 15 deletions

diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index 6f7527c013..1c8b997dcb 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -1696,7 +1696,7 @@ Qt::Orientations QFormLayout::expandingDirections() const
     QFormLayoutPrivate *e = const_cast<QFormLayoutPrivate *>(d);
     e->updateSizes();
 
-    Qt::Orientations o = 0;
+    Qt::Orientations o;
     if (e->expandHorizontal)
         o = Qt::Horizontal;
     if (e->expandVertical)
@@ -2326,7 +2326,7 @@ void QFormLayout::resetRowWrapPolicy()
 void QFormLayout::resetFormAlignment()
 {
     Q_D(QFormLayout);
-    d->formAlignment = 0;
+    d->formAlignment = { };
 }
 
 /*!
@@ -2336,7 +2336,7 @@ void QFormLayout::resetFormAlignment()
 void QFormLayout::resetLabelAlignment()
 {
     Q_D(QFormLayout);
-    d->labelAlignment = 0;
+    d->labelAlignment = { };
 }
 
 #if 0
diff --git a/src/widgets/kernel/qgesture_p.h b/src/widgets/kernel/qgesture_p.h
index cbf8d60892..057302bda1 100644
--- a/src/widgets/kernel/qgesture_p.h
+++ b/src/widgets/kernel/qgesture_p.h
@@ -111,8 +111,7 @@ class QPinchGesturePrivate : public QGesturePrivate
 
 public:
     QPinchGesturePrivate()
-        : totalChangeFlags(nullptr), changeFlags(nullptr),
-          totalScaleFactor(1), lastScaleFactor(1), scaleFactor(1),
+        : totalScaleFactor(1), lastScaleFactor(1), scaleFactor(1),
           totalRotationAngle(0), lastRotationAngle(0), rotationAngle(0),
           isNewSequence(true)
     {
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index bd06ead6f7..f0f4fc5505 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -1337,7 +1337,7 @@ QRect QLayout::alignmentRect(const QRect &r) const
       returned by QLayoutItems that have an alignment.
     */
     QLayout *that = const_cast<QLayout *>(this);
-    that->setAlignment(0);
+    that->setAlignment({ });
     QSize ms = that->maximumSize();
     that->setAlignment(a);
 
diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h
index 948c2424e6..2999bae646 100644
--- a/src/widgets/kernel/qlayoutengine_p.h
+++ b/src/widgets/kernel/qlayoutengine_p.h
@@ -105,9 +105,9 @@ Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i);
 Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w);
 Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint,
                                  const QSize &minSize, const QSize &maxSize,
-                                 const QSizePolicy &sizePolicy, Qt::Alignment align = nullptr);
-Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = nullptr);
-Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = nullptr);
+                                 const QSizePolicy &sizePolicy, Qt::Alignment align = { });
+Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = { });
+Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = { });
 
 Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm);
 
diff --git a/src/widgets/kernel/qstandardgestures.cpp b/src/widgets/kernel/qstandardgestures.cpp
index 8a95b12d89..a5c204d59d 100644
--- a/src/widgets/kernel/qstandardgestures.cpp
+++ b/src/widgets/kernel/qstandardgestures.cpp
@@ -183,7 +183,7 @@ QGestureRecognizer::Result QPinchGestureRecognizer::recognize(QGesture *state,
     }
     case QEvent::TouchUpdate: {
         const QTouchEvent *ev = static_cast<const QTouchEvent *>(event);
-        d->changeFlags = 0;
+        d->changeFlags = { };
         if (ev->touchPoints().size() == 2) {
             QTouchEvent::TouchPoint p1 = ev->touchPoints().at(0);
             QTouchEvent::TouchPoint p2 = ev->touchPoints().at(1);
@@ -256,7 +256,7 @@ void QPinchGestureRecognizer::reset(QGesture *state)
     QPinchGesture *pinch = static_cast<QPinchGesture *>(state);
     QPinchGesturePrivate *d = pinch->d_func();
 
-    d->totalChangeFlags = d->changeFlags = 0;
+    d->totalChangeFlags = d->changeFlags = { };
 
     d->startCenterPoint = d->lastCenterPoint = d->centerPoint = QPointF();
     d->totalScaleFactor = d->lastScaleFactor = d->scaleFactor = 1;
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index e9968e41b4..e96e06d874 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -396,7 +396,7 @@ void QWidget::setAutoFillBackground(bool enabled)
             If it is \nullptr (the default), the new widget will be a window.
             If not, it will be a child of \e parent, and be constrained by
             \e parent's geometry (unless you specify Qt::Window as window flag).
-        \li  \c{Qt::WindowFlags f = 0} (where available) sets the window flags;
+        \li  \c{Qt::WindowFlags f = { }} (where available) sets the window flags;
             the default is suitable for almost all widgets, but to get, for
             example, a window without a window system frame, you must use
             special flags.
@@ -1595,7 +1595,7 @@ void QWidgetPrivate::createTLExtra()
         x->basew = x->baseh = 0;
         x->frameStrut.setCoords(0, 0, 0, 0);
         x->normalGeometry = QRect(0,0,-1,-1);
-        x->savedFlags = 0;
+        x->savedFlags = { };
         x->opacity = 255;
         x->posIncludesFrame = 0;
         x->sizeAdjusted = false;
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 698928b0b0..62da3fabf4 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -592,7 +592,7 @@ public:
         Q_Q(QWidget);
         return q->testAttribute(Qt::WA_AlwaysStackOnTop)
             ? QPlatformTextureList::StacksOnTop
-            : QPlatformTextureList::Flags(nullptr);
+            : QPlatformTextureList::Flags();
     }
     virtual QImage grabFramebuffer() { return QImage(); }
     virtual void beginBackingStorePainting() { }
diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h
index c6de168c10..72474077aa 100644
--- a/src/widgets/kernel/qwindowcontainer_p.h
+++ b/src/widgets/kernel/qwindowcontainer_p.h
@@ -64,7 +64,7 @@ class Q_WIDGETS_EXPORT QWindowContainer : public QWidget
     Q_DECLARE_PRIVATE(QWindowContainer)
 
 public:
-    explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+    explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = nullptr, Qt::WindowFlags f = { });
     ~QWindowContainer();
     QWindow *containedWindow() const;