tests/auto/widgets: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).

- Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer).
- Replace Q[TRY]_VERIFY(smartPointer == 0)  by
          Q[TRY]_VERIFY(smartPointer.isNull()).
- Replace Q[TRY]_VERIFY(a == b) by  Q[TRY]_COMPARE(a, b) and
  add casts where necessary. The values will then be logged
  should a test fail.

Change-Id: Ie29640451dddeb58342038a8cd5fac152cce39e5
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
index 2bbc2e05b7..82832bced1 100644
--- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
@@ -120,7 +120,7 @@ void tst_QDockWidget::widget()
 {
     {
         QDockWidget dw;
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
     }
 
     {
@@ -130,32 +130,32 @@ void tst_QDockWidget::widget()
 
         dw.setWidget(w1);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w1);
+        QCOMPARE(dw.widget(), w1);
         QCOMPARE(w1->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
 
         dw.setWidget(w2);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
 
         dw.setWidget(w1);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w1);
+        QCOMPARE(dw.widget(), w1);
         QCOMPARE(w1->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(w2);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
     }
 
     {
@@ -165,37 +165,37 @@ void tst_QDockWidget::widget()
 
         dw.setWidget(w1);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w1);
+        QCOMPARE(dw.widget(), w1);
         QCOMPARE(w1->parentWidget(), (QWidget*)&dw);
 
         w1->setParent(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
 
         dw.setWidget(w2);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         w2->setParent(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
 
         dw.setWidget(w1);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w1);
+        QCOMPARE(dw.widget(), w1);
         QCOMPARE(w1->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(w2);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         w1->setParent(0);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         w2->setParent(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
         delete w1;
         delete w2;
     }