From c1c3e7546f578554d1de0f865cb4fa359a8d0109 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 4 Jun 2019 10:24:08 +0200 Subject: Fix various clang warnings - Use static QFileInfo::exists() - Fix else after return/break - Use Q_ENUM Change-Id: I08d5b48224e5b43c795929765b4ab4c0b137224f Reviewed-by: Oliver Wolff --- tests/auto/qpixmap/tst_qpixmap.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 10443e4..b028f52 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -227,7 +227,7 @@ void tst_QPixmap::toHICON() SelectObject(bitmapDc, bitmap); const QString imageFileName = pngFileName(image, width, height); - QVERIFY2(QFileInfo(imageFileName).exists(), qPrintable(imageFileName)); + QVERIFY2(QFileInfo::exists(imageFileName), qPrintable(imageFileName)); const QImage imageFromFile = QImage(imageFileName).convertToFormat(QImage::Format_ARGB32_Premultiplied); QVERIFY(!imageFromFile.isNull()); @@ -262,7 +262,7 @@ void tst_QPixmap::fromHICON() QFETCH(QString, image); const QString iconFileName = image + QStringLiteral(".ico"); - QVERIFY2(QFileInfo(iconFileName).exists(), qPrintable(iconFileName)); + QVERIFY2(QFileInfo::exists(iconFileName), qPrintable(iconFileName)); const HICON icon = static_cast(LoadImage(nullptr, reinterpret_cast(iconFileName.utf16()), @@ -271,7 +271,7 @@ void tst_QPixmap::fromHICON() DestroyIcon(icon); const QString imageFileName = pngFileName(image, width, height); - QVERIFY2(QFileInfo(imageFileName).exists(), qPrintable(imageFileName)); + QVERIFY2(QFileInfo::exists(imageFileName), qPrintable(imageFileName)); const QImage imageFromFile = QImage(imageFileName).convertToFormat(QImage::Format_ARGB32_Premultiplied); QVERIFY(!imageFromFile.isNull()); -- cgit v1.2.3