From 8759ac2fc072738ac841117de2cda1c7f4fb5c55 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 4 Jun 2019 09:52:39 +0200 Subject: Introduce nullptr Apply Fixits by Qt Creator. Introduce more member initialization. Change-Id: I81c6860188f0e1592c4df2435ff7f91500456741 Reviewed-by: Oliver Wolff --- tests/auto/qpixmap/tst_qpixmap.cpp | 18 +++++++++--------- tests/auto/qwinjumplist/tst_qwinjumplist.cpp | 8 ++++---- tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp | 2 +- .../qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp | 4 ++-- tests/manual/dwmfeatures/testwidget.h | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'tests') diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 8383194..10443e4 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -87,7 +87,7 @@ void tst_QPixmap::toHBITMAP() const HBITMAP bitmap = QtWin::toHBITMAP(pm); - QVERIFY(bitmap != 0); + QVERIFY(bitmap != nullptr); // Verify size BITMAP bitmapInfo; @@ -98,7 +98,7 @@ void tst_QPixmap::toHBITMAP() QCOMPARE(LONG(100), bitmapInfo.bmWidth); QCOMPARE(LONG(100), bitmapInfo.bmHeight); - const HDC displayDc = GetDC(0); + const HDC displayDc = GetDC(nullptr); const HDC bitmapDc = CreateCompatibleDC(displayDc); const HBITMAP nullBitmap = static_cast(SelectObject(bitmapDc, bitmap)); @@ -112,7 +112,7 @@ void tst_QPixmap::toHBITMAP() SelectObject(bitmapDc, nullBitmap); DeleteObject(bitmap); DeleteDC(bitmapDc); - ReleaseDC(0, displayDc); + ReleaseDC(nullptr, displayDc); } void tst_QPixmap::fromHBITMAP_data() @@ -126,7 +126,7 @@ void tst_QPixmap::fromHBITMAP() QFETCH(int, green); QFETCH(int, blue); - const HDC displayDc = GetDC(0); + const HDC displayDc = GetDC(nullptr); const HDC bitmapDc = CreateCompatibleDC(displayDc); const HBITMAP bitmap = CreateCompatibleBitmap(displayDc, 100, 100); SelectObject(bitmapDc, bitmap); @@ -148,7 +148,7 @@ void tst_QPixmap::fromHBITMAP() DeleteObject(SelectObject(bitmapDc, oldBrush)); DeleteObject(SelectObject(bitmapDc, bitmap)); DeleteDC(bitmapDc); - ReleaseDC(0, displayDc); + ReleaseDC(nullptr, displayDc); } static bool compareImages(const QImage &actual, const QImage &expected, @@ -221,7 +221,7 @@ void tst_QPixmap::toHICON() QPixmap empty(width, height); empty.fill(Qt::transparent); - const HDC displayDc = GetDC(0); + const HDC displayDc = GetDC(nullptr); const HDC bitmapDc = CreateCompatibleDC(displayDc); const HBITMAP bitmap = QtWin::toHBITMAP(empty, QtWin::HBitmapAlpha); SelectObject(bitmapDc, bitmap); @@ -234,7 +234,7 @@ void tst_QPixmap::toHICON() const HICON icon = QtWin::toHICON(QPixmap::fromImage(imageFromFile)); - DrawIconEx(bitmapDc, 0, 0, icon, width, height, 0, 0, DI_NORMAL); + DrawIconEx(bitmapDc, 0, 0, icon, width, height, 0, nullptr, DI_NORMAL); DestroyIcon(icon); DeleteDC(bitmapDc); @@ -242,7 +242,7 @@ void tst_QPixmap::toHICON() const QImage imageFromHICON = QtWin::fromHBITMAP(bitmap, QtWin::HBitmapAlpha).toImage(); QVERIFY(!imageFromHICON.isNull()); - ReleaseDC(0, displayDc); + ReleaseDC(nullptr, displayDc); // fuzzy comparison must be used, as the pixel values change slightly during conversion // between QImage::Format_ARGB32 and QImage::Format_ARGB32_Premultiplied, or elsewhere @@ -265,7 +265,7 @@ void tst_QPixmap::fromHICON() QVERIFY2(QFileInfo(iconFileName).exists(), qPrintable(iconFileName)); const HICON icon = - static_cast(LoadImage(0, reinterpret_cast(iconFileName.utf16()), + static_cast(LoadImage(nullptr, reinterpret_cast(iconFileName.utf16()), IMAGE_ICON, width, height, LR_LOADFROMFILE)); const QImage imageFromHICON = QtWin::fromHICON(icon).toImage(); DestroyIcon(icon); diff --git a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp index 40d6b04..52b1ee5 100644 --- a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp +++ b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp @@ -67,7 +67,7 @@ void tst_QWinJumpList::testRecent() recent1->clear(); QVERIFY(recent1->isEmpty()); - recent1->addItem(0); + recent1->addItem(nullptr); QVERIFY(recent1->isEmpty()); recent1->setVisible(true); @@ -116,7 +116,7 @@ void tst_QWinJumpList::testFrequent() frequent1->clear(); QVERIFY(frequent1->isEmpty()); - frequent1->addItem(0); + frequent1->addItem(nullptr); QVERIFY(frequent1->isEmpty()); frequent1->setVisible(true); @@ -164,7 +164,7 @@ void tst_QWinJumpList::testTasks() tasks->setVisible(true); QVERIFY(tasks->isVisible()); - tasks->addItem(0); + tasks->addItem(nullptr); QVERIFY(tasks->isEmpty()); QWinJumpListItem* link1 = tasks->addLink(QStringLiteral("tst_QWinJumpList"), QCoreApplication::applicationFilePath()); @@ -203,7 +203,7 @@ void tst_QWinJumpList::testCategories() QWinJumpList jumplist; QVERIFY(jumplist.categories().isEmpty()); - jumplist.addCategory(0); + jumplist.addCategory(nullptr); QWinJumpListCategory *cat1 = new QWinJumpListCategory(QStringLiteral("tmp")); QCOMPARE(cat1->title(), QStringLiteral("tmp")); diff --git a/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp b/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp index 82c93f9..c3c682e 100644 --- a/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp +++ b/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp @@ -52,7 +52,7 @@ void tst_QWinTaskbarButton::testWindow() QWinTaskbarButton *btn2 = new QWinTaskbarButton(&window); QCOMPARE(btn2->window(), &window); - btn2->setWindow(0); + btn2->setWindow(nullptr); QVERIFY(!btn2->window()); } diff --git a/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp b/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp index d5a722a..91535ef 100644 --- a/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp +++ b/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp @@ -50,7 +50,7 @@ void tst_QWinThumbnailToolBar::testWindow() QWinThumbnailToolBar *tbar2 = new QWinThumbnailToolBar(&window); QCOMPARE(tbar2->window(), &window); - tbar2->setWindow(0); + tbar2->setWindow(nullptr); QVERIFY(!tbar2->window()); } @@ -60,7 +60,7 @@ void tst_QWinThumbnailToolBar::testButtons() QCOMPARE(tbar.count(), 0); QVERIFY(tbar.buttons().isEmpty()); - tbar.addButton(0); + tbar.addButton(nullptr); QCOMPARE(tbar.count(), 0); QVERIFY(tbar.buttons().isEmpty()); diff --git a/tests/manual/dwmfeatures/testwidget.h b/tests/manual/dwmfeatures/testwidget.h index 8004eca..137e8ce 100644 --- a/tests/manual/dwmfeatures/testwidget.h +++ b/tests/manual/dwmfeatures/testwidget.h @@ -46,7 +46,7 @@ class TestWidget : public QWidget Q_OBJECT public: - explicit TestWidget(QWidget *parent = 0); + explicit TestWidget(QWidget *parent = nullptr); ~TestWidget(); protected: -- cgit v1.2.3