diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-04 11:58:35 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-04 11:58:35 +0200 |
commit | 5c6762c53d47b3bd3b604afd389669a3670b1ec5 (patch) | |
tree | e717ba17a3a4f6679d5e163a6c879283123d1710 /tests/auto | |
parent | c1c3e7546f578554d1de0f865cb4fa359a8d0109 (diff) |
Fix clang warnings about repetitive type names
Fix warning like:
warning: use auto when initializing with new/reinterpret_cast to avoid duplicating the type name [modernize-use-auto]
Change-Id: I46919c041f6a217e098b82c9f7f6548e0a0a9ec5
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index b028f52..2791cd2 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -101,7 +101,7 @@ void tst_QPixmap::toHBITMAP() const HDC displayDc = GetDC(nullptr); const HDC bitmapDc = CreateCompatibleDC(displayDc); - const HBITMAP nullBitmap = static_cast<HBITMAP>(SelectObject(bitmapDc, bitmap)); + const auto nullBitmap = static_cast<HBITMAP>(SelectObject(bitmapDc, bitmap)); const COLORREF pixel = GetPixel(bitmapDc, 0, 0); QCOMPARE(int(GetRValue(pixel)), red); @@ -264,7 +264,7 @@ void tst_QPixmap::fromHICON() const QString iconFileName = image + QStringLiteral(".ico"); QVERIFY2(QFileInfo::exists(iconFileName), qPrintable(iconFileName)); - const HICON icon = + const auto icon = static_cast<HICON>(LoadImage(nullptr, reinterpret_cast<const wchar_t *>(iconFileName.utf16()), IMAGE_ICON, width, height, LR_LOADFROMFILE)); const QImage imageFromHICON = QtWin::fromHICON(icon).toImage(); diff --git a/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp b/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp index c3c682e..a9287a0 100644 --- a/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp +++ b/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp @@ -50,7 +50,7 @@ void tst_QWinTaskbarButton::testWindow() btn1.setWindow(&window); QCOMPARE(btn1.window(), &window); - QWinTaskbarButton *btn2 = new QWinTaskbarButton(&window); + auto *btn2 = new QWinTaskbarButton(&window); QCOMPARE(btn2->window(), &window); btn2->setWindow(nullptr); QVERIFY(!btn2->window()); diff --git a/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp b/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp index 91535ef..fc53a24 100644 --- a/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp +++ b/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp @@ -48,7 +48,7 @@ void tst_QWinThumbnailToolBar::testWindow() tbar1.setWindow(&window); QCOMPARE(tbar1.window(), &window); - QWinThumbnailToolBar *tbar2 = new QWinThumbnailToolBar(&window); + auto *tbar2 = new QWinThumbnailToolBar(&window); QCOMPARE(tbar2->window(), &window); tbar2->setWindow(nullptr); QVERIFY(!tbar2->window()); @@ -64,8 +64,8 @@ void tst_QWinThumbnailToolBar::testButtons() QCOMPARE(tbar.count(), 0); QVERIFY(tbar.buttons().isEmpty()); - QWinThumbnailToolButton *btn1 = new QWinThumbnailToolButton; - QWinThumbnailToolButton *btn2 = new QWinThumbnailToolButton; + auto *btn1 = new QWinThumbnailToolButton; + auto *btn2 = new QWinThumbnailToolButton; tbar.addButton(btn1); QCOMPARE(tbar.count(), 1); |