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>

15 files changed, 42 insertions, 42 deletions

diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp
index 1568855032..be75f5b3cc 100644
--- a/tests/auto/corelib/global/qflags/tst_qflags.cpp
+++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp
@@ -49,7 +49,7 @@ void tst_QFlags::testFlag() const
     QVERIFY(btn.testFlag(Qt::LeftButton));
     QVERIFY(!btn.testFlag(Qt::MidButton));
 
-    btn = 0;
+    btn = { };
     QVERIFY(!btn.testFlag(Qt::LeftButton));
 }
 
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index b8ae95dd93..16a30af892 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -499,7 +499,7 @@ void tst_QFile::initTestCase()
     file.write("b", 1);
     file.close();
 #ifndef Q_OS_WIN // Not supported on Windows.
-    QVERIFY2(file.setPermissions(0), qPrintable(file.errorString()));
+    QVERIFY2(file.setPermissions({ }), qPrintable(file.errorString()));
 #else
     QVERIFY2(file.open(QFile::WriteOnly), msgOpenFailed(file).constData());
 #endif
@@ -2211,7 +2211,7 @@ public:
     QStringList entryList(QDir::Filters, const QStringList &) const { return QStringList(); }
     bool caseSensitive() const { return false; }
     bool isRelativePath() const { return false; }
-    FileFlags fileFlags(FileFlags) const { return 0; }
+    FileFlags fileFlags(FileFlags) const { return { }; }
     bool chmod(uint) { return false; }
     QString fileName(FileName) const { return name; }
     uint ownerId(FileOwner) const { return 0; }
diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
index bcf6d6c32b..5c6e633749 100644
--- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
+++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
@@ -848,7 +848,7 @@ void tst_QUrlInternal::correctEncodedMistakes()
     QString dataTag = QTest::currentDataTag();
     QString output = dataTag;
 
-    if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), 0))
+    if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), { }))
         output += input;
     QCOMPARE(output, dataTag + expected);
 
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
index c74101928a..ccb6a457a6 100644
--- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -2059,7 +2059,7 @@ void tst_QItemSelectionModel::unselectable()
     QCOMPARE(selectionModel.selectedIndexes().count(), 10);
     QCOMPARE(selectionModel.selectedRows().count(), 10);
     for (int j = 0; j < 10; ++j)
-        model.item(j)->setFlags(0);
+        model.item(j)->setFlags({ });
     QCOMPARE(selectionModel.selectedIndexes().count(), 0);
     QCOMPARE(selectionModel.selectedRows().count(), 0);
 }
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index 20ed7500b5..0b2d33dc09 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -1340,7 +1340,7 @@ void tst_QLocale::long_long_conversion()
 void tst_QLocale::long_long_conversion_extra()
 {
     QLocale l(QLocale::C);
-    l.setNumberOptions(0);
+    l.setNumberOptions({ });
     QCOMPARE(l.toString((qlonglong)1), QString("1"));
     QCOMPARE(l.toString((qlonglong)12), QString("12"));
     QCOMPARE(l.toString((qlonglong)123), QString("123"));
@@ -2087,7 +2087,7 @@ void tst_QLocale::numberOptions()
     QVERIFY(ok);
     QCOMPARE(locale.toString(12345), QString("12345"));
 
-    locale.setNumberOptions(0);
+    locale.setNumberOptions({ });
     QCOMPARE(locale.numberOptions(), 0);
     QCOMPARE(locale.toInt(QString("12,345"), &ok), 12345);
     QVERIFY(ok);
diff --git a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
index fdcd8b07c7..0f266200af 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
+++ b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
@@ -737,7 +737,7 @@ void tst_QDBusAbstractAdaptor::sameObjectDifferentPaths()
     MyObject obj(2);
 
     con.registerObject("/p1",&obj);
-    con.registerObject("/p2",&obj, 0); // don't export anything
+    con.registerObject("/p2",&obj, { }); // don't export anything
 
     QDBusSignalSpy spy;
     con.connect(con.baseService(), "/p1", "local.Interface2", "signal", &spy, SLOT(slot(QDBusMessage)));
@@ -759,7 +759,7 @@ void tst_QDBusAbstractAdaptor::scriptableSignalOrNot()
         MyObject obj(0);
 
         con.registerObject("/p1",&obj, QDBusConnection::ExportScriptableSignals);
-        con.registerObject("/p2",&obj, 0); // don't export anything
+        con.registerObject("/p2",&obj, { }); // don't export anything
 
         QDBusSignalSpy spy;
         con.connect(con.baseService(), "/p1", "local.MyObject", "scriptableSignalVoid", &spy, SLOT(slot(QDBusMessage)));
@@ -1270,7 +1270,7 @@ void tst_QDBusAbstractAdaptor::sameObjectDifferentPathsPeer()
     newMyObjectPeer(2);
 
     registerMyObjectPeer("/p1");
-    registerMyObjectPeer("/p2", 0); // don't export anything
+    registerMyObjectPeer("/p2", { }); // don't export anything
 
     syncPeer();
     QDBusSignalSpy spy;
@@ -1294,7 +1294,7 @@ void tst_QDBusAbstractAdaptor::scriptableSignalOrNotPeer()
         newMyObjectPeer(0);
 
         registerMyObjectPeer("/p1", QDBusConnection::ExportScriptableSignals);
-        registerMyObjectPeer("/p2", 0); // don't export anything
+        registerMyObjectPeer("/p2", { }); // don't export anything
 
         syncPeer();
         QDBusSignalSpy spy;
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 6e48439944..de9c876b3f 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -715,7 +715,7 @@ void tst_QPainter::drawBorderPixmap()
     QPainter p(&pm);
     p.setTransform(QTransform(-1,0,0,-1,173.5,153.5));
     qDrawBorderPixmap(&p, QRect(0,0,75,105), QMargins(39,39,39,39), src, QRect(0,0,79,79), QMargins(39,39,39,39),
-                       QTileRules(Qt::StretchTile,Qt::StretchTile), 0);
+                       QTileRules(Qt::StretchTile,Qt::StretchTile), { });
 }
 #endif
 
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index 7b2ff4cc10..474079037b 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -1041,7 +1041,7 @@ public:
         QList<QRectF> rects;
 
         PaintEngine()
-            : QPaintEngine(0)
+            : QPaintEngine(QPaintEngine::PaintEngineFeatures{ })
         {}
         virtual Type type() const
         {
diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
index 8d32ddf37c..a13adc8ebf 100644
--- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
@@ -1272,7 +1272,7 @@ void tst_QNetworkSession::usagePolicies()
     QNetworkSession::UsagePolicies initial;
     initial = session.usagePolicies();
     if (initial != 0)
-        QNetworkSessionPrivate::setUsagePolicies(session, 0);
+        QNetworkSessionPrivate::setUsagePolicies(session, { });
     QSignalSpy spy(&session, SIGNAL(usagePoliciesChanged(QNetworkSession::UsagePolicies)));
     QNetworkSessionPrivate::setUsagePolicies(session, QNetworkSession::NoBackgroundTrafficPolicy);
     QCOMPARE(spy.count(), 1);
diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp
index 9abe9a77c0..c1d39d8b72 100644
--- a/tests/auto/other/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
@@ -106,7 +106,7 @@ public:
     QGestureRecognizer::Result recognize(QGesture *state, QObject*, QEvent *event)
     {
         if (event->type() == CustomEvent::EventType) {
-            QGestureRecognizer::Result result = 0;
+            QGestureRecognizer::Result result;
             if (CustomGestureRecognizer::ConsumeEvents)
                 result |= QGestureRecognizer::ConsumeEventHint;
             CustomGesture *g = static_cast<CustomGesture*>(state);
@@ -2200,41 +2200,41 @@ void tst_Gestures::testReuseCanceledGestures()
     targetPos = gv->viewport()->mapFromParent(targetPos);
 
     // "Tap" starts on child widget
-    QTest::mousePress(gv->viewport(), Qt::LeftButton, 0, targetPos);
+    QTest::mousePress(gv->viewport(), Qt::LeftButton, { }, targetPos);
     QCOMPARE(target->started(),  1);
     QCOMPARE(target->updated(),  0);
     QCOMPARE(target->finished(), 0);
     QCOMPARE(target->canceled(), 0);
 
     // Canceling gesture starts on parent
-    QTest::mousePress(gv->viewport(), Qt::RightButton, 0, targetPos);
+    QTest::mousePress(gv->viewport(), Qt::RightButton, { }, targetPos);
     QCOMPARE(target->started(),  1);
     QCOMPARE(target->updated(),  0);
     QCOMPARE(target->finished(), 0);
     QCOMPARE(target->canceled(), 1); // <- child canceled
 
     // Canceling gesture ends
-    QTest::mouseRelease(gv->viewport(), Qt::RightButton, 0, targetPos);
+    QTest::mouseRelease(gv->viewport(), Qt::RightButton, { }, targetPos);
     QCOMPARE(target->started(),  1);
     QCOMPARE(target->updated(),  0);
     QCOMPARE(target->finished(), 0);
     QCOMPARE(target->canceled(), 1);
 
     // Tap would end if not canceled
-    QTest::mouseRelease(gv->viewport(), Qt::LeftButton, 0, targetPos);
+    QTest::mouseRelease(gv->viewport(), Qt::LeftButton, { }, targetPos);
     QCOMPARE(target->started(),  1);
     QCOMPARE(target->updated(),  0);
     QCOMPARE(target->finished(), 0);
     QCOMPARE(target->canceled(), 1);
 
     // New "Tap" starts
-    QTest::mousePress(gv->viewport(), Qt::LeftButton, 0, targetPos);
+    QTest::mousePress(gv->viewport(), Qt::LeftButton, { }, targetPos);
     QCOMPARE(target->started(),  2);
     QCOMPARE(target->updated(),  0);
     QCOMPARE(target->finished(), 0);
     QCOMPARE(target->canceled(), 1);
 
-    QTest::mouseRelease(gv->viewport(), Qt::LeftButton, 0, targetPos);
+    QTest::mouseRelease(gv->viewport(), Qt::LeftButton, { }, targetPos);
     QCOMPARE(target->started(),  2);
     QCOMPARE(target->updated(),  0);
     QCOMPARE(target->finished(), 1);
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 7d7fa6403b..95a8230fe3 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -310,7 +310,7 @@ void tst_QAccessibility::eventTest()
     QVERIFY(QTestAccessibility::containsEvent(&showEvent));
     button->setFocus(Qt::MouseFocusReason);
     QTestAccessibility::clearEvents();
-    QTest::mouseClick(button, Qt::LeftButton, 0);
+    QTest::mouseClick(button, Qt::LeftButton, { });
 
     button->setAccessibleName("Olaf the second");
     QAccessibleEvent nameEvent(button, QAccessible::NameChanged);
@@ -2829,14 +2829,14 @@ void tst_QAccessibility::listTest()
     QTestAccessibility::clearEvents();
 
     // Check for events
-    QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(1)).center());
+    QTest::mouseClick(listView->viewport(), Qt::LeftButton, { }, listView->visualItemRect(listView->item(1)).center());
     QAccessibleEvent selectionEvent(listView, QAccessible::SelectionAdd);
     selectionEvent.setChild(1);
     QAccessibleEvent focusEvent(listView, QAccessible::Focus);
     focusEvent.setChild(1);
     QVERIFY(QTestAccessibility::containsEvent(&selectionEvent));
     QVERIFY(QTestAccessibility::containsEvent(&focusEvent));
-    QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(2)).center());
+    QTest::mouseClick(listView->viewport(), Qt::LeftButton, { }, listView->visualItemRect(listView->item(2)).center());
 
     QAccessibleEvent selectionEvent2(listView, QAccessible::SelectionAdd);
     selectionEvent2.setChild(2);
diff --git a/tests/auto/testlib/selftests/mouse/tst_mouse.cpp b/tests/auto/testlib/selftests/mouse/tst_mouse.cpp
index 3c731cde69..d097027e7e 100644
--- a/tests/auto/testlib/selftests/mouse/tst_mouse.cpp
+++ b/tests/auto/testlib/selftests/mouse/tst_mouse.cpp
@@ -93,31 +93,31 @@ void tst_Mouse::stateHandlingPart1()
     // verify that we have a clean state after the previous data set
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::NoButton);
 
-    QTest::mousePress(&w, Qt::LeftButton, 0, point);
+    QTest::mousePress(&w, Qt::LeftButton, { }, point);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton);
-    QTest::mousePress(&w, Qt::RightButton, 0, point);
+    QTest::mousePress(&w, Qt::RightButton, { }, point);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton | Qt::RightButton);
     QTest::mouseMove(&w, point += step);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton | Qt::RightButton);
-    QTest::mouseRelease(&w, Qt::LeftButton, 0, point);
+    QTest::mouseRelease(&w, Qt::LeftButton, { }, point);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::RightButton);
     QTest::mouseMove(&w, point += step);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::RightButton);
     // test invalid input - left button was already released
-    QTest::mouseRelease(&w, Qt::LeftButton, 0, point += point);
+    QTest::mouseRelease(&w, Qt::LeftButton, { }, point += point);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::RightButton);
     // test invalid input - right button is already pressed
-    QTest::mousePress(&w, Qt::RightButton, 0, point);
+    QTest::mousePress(&w, Qt::RightButton, { }, point);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::RightButton);
     // now continue with valid input
-    QTest::mouseRelease(&w, Qt::RightButton, 0, point += point);
+    QTest::mouseRelease(&w, Qt::RightButton, { }, point += point);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::NoButton);
     QTest::mouseMove(&w, point += step);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::NoButton);
 
     // exit this test function with some button in a pressed state
-    QTest::mousePress(&w, Qt::LeftButton, 0, point);
-    QTest::mousePress(&w, Qt::RightButton, 0, point);
+    QTest::mousePress(&w, Qt::LeftButton, { }, point);
+    QTest::mousePress(&w, Qt::RightButton, { }, point);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton | Qt::RightButton);
 }
 
@@ -144,8 +144,8 @@ void tst_Mouse::stateHandlingPart2()
     QSKIP("Not implemented beyond this point!");
 
     QPoint point(40, 40);
-    QTest::mousePress(&w, Qt::LeftButton, 0, point);
-    QTest::mousePress(&w, Qt::RightButton, 0, point);
+    QTest::mousePress(&w, Qt::LeftButton, { }, point);
+    QTest::mousePress(&w, Qt::RightButton, { }, point);
     QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton | Qt::RightButton);
     w.moveCount = 0;
     // The windowing system will send mouse events with no buttons set
@@ -201,11 +201,11 @@ void tst_Mouse::deterministicEvents()
     QCOMPARE(w.moveCount, 0);
     static QPoint m_cachedLastCursorPosition;
     if (firstRun) {
-        QTest::mousePress(&w, Qt::LeftButton, 0, QPoint(40, 40));
+        QTest::mousePress(&w, Qt::LeftButton, { }, QPoint(40, 40));
         m_cachedLastCursorPosition = QGuiApplicationPrivate::lastCursorPosition.toPoint();
     } else {
         QPoint point = w.mapFromGlobal(m_cachedLastCursorPosition);
-        QTest::mousePress(&w, Qt::LeftButton, 0, point);
+        QTest::mousePress(&w, Qt::LeftButton, { }, point);
     }
     QCOMPARE(w.pressCount, 1);
     QCOMPARE(w.moveCount, 1);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index ad17c2a557..5a9ba5c9d3 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -340,7 +340,7 @@ void tst_QGraphicsGridLayout::qgraphicsgridlayout()
     layout.setColumnStretchFactor(0, 0);
     layout.setGeometry(QRectF());
     layout.setHorizontalSpacing(0);
-    layout.setRowAlignment(0, 0);
+    layout.setRowAlignment(0, { });
     layout.setRowFixedHeight(0, 0);
     layout.setRowMaximumHeight(0, 0);
     layout.setRowMinimumHeight(0, 0);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 6d415952c9..35037eb323 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -1912,7 +1912,7 @@ void tst_QGraphicsItem::acceptedMouseButtons()
     event.setScenePos(QPointF(0, 0));
     QCoreApplication::sendEvent(&scene, &event);
     QCOMPARE(scene.mouseGrabberItem(), item2);
-    item2->setAcceptedMouseButtons(nullptr);
+    item2->setAcceptedMouseButtons({ });
     QCOMPARE(scene.mouseGrabberItem(), nullptr);
     QCoreApplication::sendEvent(&scene, &event);
     QCOMPARE(scene.mouseGrabberItem(), item1);
@@ -8069,7 +8069,7 @@ void tst_QGraphicsItem::itemUsesExtendedStyleOption()
 void tst_QGraphicsItem::itemSendsGeometryChanges()
 {
     ItemChangeTester item;
-    item.setFlags(nullptr);
+    item.setFlags({ });
     item.clear();
 
     QTransform x = QTransform().rotate(45);
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index d3477be986..c42e74ddbd 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -174,7 +174,7 @@ private slots:
 // Subclass that exposes the protected functions.
 class SubQGraphicsWidget : public QGraphicsWidget {
 public:
-    SubQGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags windowFlags = 0)
+    SubQGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags windowFlags = { })
         : QGraphicsWidget(parent, windowFlags), eventCount(0)
         { }
 
@@ -254,7 +254,7 @@ protected:
 class SizeHinter : public QGraphicsWidget
 {
 public:
-    SizeHinter(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0,
+    SizeHinter(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = { },
                 const QSizeF &min = QSizeF(5,5),
                 const QSizeF &pref = QSizeF(50, 50),
                 const QSizeF &max = QSizeF(500, 500))
@@ -2580,7 +2580,7 @@ void tst_QGraphicsWidget::shortcutsDeletion()
 class MessUpPainterWidget : public QGraphicsWidget
 {
 public:
-    MessUpPainterWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0)
+    MessUpPainterWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = { })
     : QGraphicsWidget(parent, wFlags)
     {}