aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-04 11:58:35 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-04 11:58:35 +0200
commit5c6762c53d47b3bd3b604afd389669a3670b1ec5 (patch)
treee717ba17a3a4f6679d5e163a6c879283123d1710 /tests
parentc1c3e7546f578554d1de0f865cb4fa359a8d0109 (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')
-rw-r--r--tests/auto/qpixmap/tst_qpixmap.cpp4
-rw-r--r--tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp2
-rw-r--r--tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp6
-rw-r--r--tests/manual/dwmfeatures/testwidget.cpp2
-rw-r--r--tests/manual/imageconversion/main.cpp10
-rw-r--r--tests/manual/jumplist/testwidget.cpp2
-rw-r--r--tests/manual/thumbnail/main.cpp2
7 files changed, 14 insertions, 14 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);
diff --git a/tests/manual/dwmfeatures/testwidget.cpp b/tests/manual/dwmfeatures/testwidget.cpp
index d79502a..09b25ac 100644
--- a/tests/manual/dwmfeatures/testwidget.cpp
+++ b/tests/manual/dwmfeatures/testwidget.cpp
@@ -76,7 +76,7 @@ void TestWidget::changeEvent(QEvent *e)
bool TestWidget::event(QEvent *e)
{
if (e->type() == QWinEvent::CompositionChange) {
- QWinCompositionChangeEvent *event = static_cast<QWinCompositionChangeEvent *>(e);
+ auto *event = static_cast<QWinCompositionChangeEvent *>(e);
qDebug() << "Composition state change: " << event->isCompositionEnabled();
} else if (e->type() == QWinEvent::ThemeChange) {
qDebug() << "Theme change.";
diff --git a/tests/manual/imageconversion/main.cpp b/tests/manual/imageconversion/main.cpp
index a0fc46a..def9cdb 100644
--- a/tests/manual/imageconversion/main.cpp
+++ b/tests/manual/imageconversion/main.cpp
@@ -153,9 +153,9 @@ PreviewDialog::PreviewDialog(const QImage &image, QWidget *parent) : QDialog(par
QDebug(&description) << image.size() << ", format=" << image.format();
QLabel *descriptionLabel = new QLabel(description, this);
descriptionLabel->setWordWrap(true);
- QVBoxLayout *layout = new QVBoxLayout(this);
+ auto *layout = new QVBoxLayout(this);
layout->addWidget(descriptionLabel);
- QHBoxLayout *hLayout = new QHBoxLayout;
+ auto *hLayout = new QHBoxLayout;
QLabel *label = new QLabel(this);
label->setFrameShape(QFrame::Box);
label->setPixmap(QPixmap::fromImage(image));
@@ -222,7 +222,7 @@ void PaintWidget::convertBack()
{
QImage image = QtWin::imageFromHBITMAP(m_hBitmap);
formatImage(qDebug(), image);
- PreviewDialog *dialog = new PreviewDialog(image, this);
+ auto *dialog = new PreviewDialog(image, this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setModal(false);
dialog->setWindowTitle(QLatin1String("QImage - Qt ") + QLatin1String(QT_VERSION_STR));
@@ -371,14 +371,14 @@ int main(int argc, char *argv[])
int exitCode = 0;
{
PaintWidget paintWidget(bitmap);
- QShortcut *quitShortcut = new QShortcut(&paintWidget);
+ auto *quitShortcut = new QShortcut(&paintWidget);
quitShortcut->setKey(Qt::CTRL + Qt::Key_Q);
quitShortcut->setContext(Qt::ApplicationShortcut);
QObject::connect(quitShortcut, &QShortcut::activated, qApp, &QCoreApplication::quit);
paintWidget.setWindowTitle(QLatin1String("HBITMAP - Qt ") + QLatin1String(QT_VERSION_STR));
paintWidget.show();
if (preview) {
- PreviewDialog *dialog = new PreviewDialog(image);
+ auto *dialog = new PreviewDialog(image);
dialog->setModal(false);
dialog->setWindowTitle(QLatin1String("QImage - Qt ") + QLatin1String(QT_VERSION_STR));
dialog->move(paintWidget.frameGeometry().topRight() + QPoint(50, 0));
diff --git a/tests/manual/jumplist/testwidget.cpp b/tests/manual/jumplist/testwidget.cpp
index cbe8a3d..0928c59 100644
--- a/tests/manual/jumplist/testwidget.cpp
+++ b/tests/manual/jumplist/testwidget.cpp
@@ -105,7 +105,7 @@ void TestWidget::updateJumpList()
jumplist.recent()->setVisible(ui->cbShowRecent->isChecked());
jumplist.frequent()->setVisible(ui->cbShowFrequent->isChecked());
if (ui->cbRunFullscreen->isChecked()) {
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Link);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Link);
item->setTitle(ui->cbRunFullscreen->text());
item->setFilePath(applicationBinary);
item->setArguments(QStringList("-fullscreen"));
diff --git a/tests/manual/thumbnail/main.cpp b/tests/manual/thumbnail/main.cpp
index 99096ec..009662f 100644
--- a/tests/manual/thumbnail/main.cpp
+++ b/tests/manual/thumbnail/main.cpp
@@ -104,7 +104,7 @@ MainWindow::MainWindow()
void MainWindow::initThumbnailToolBar()
{
m_thumbnailToolBar->setWindow(windowHandle());
- QWinThumbnailToolButton *testButton = new QWinThumbnailToolButton(m_thumbnailToolBar);
+ auto *testButton = new QWinThumbnailToolButton(m_thumbnailToolBar);
testButton->setToolTip("Test");
testButton->setIcon(style()->standardIcon(QStyle::SP_ComputerIcon));
connect(testButton, &QWinThumbnailToolButton::clicked, this, &MainWindow::testButtonClicked);