aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--examples/winextras/iconextractor/main.cpp4
-rw-r--r--examples/winextras/musicplayer/volumebutton.cpp2
-rw-r--r--src/imports/winextras/qquickdwmfeatures.cpp4
-rw-r--r--src/imports/winextras/qquickiconloader.cpp4
-rw-r--r--src/imports/winextras/qquickiconloader_p.h2
-rw-r--r--src/imports/winextras/qquickjumplist.cpp10
-rw-r--r--src/imports/winextras/qquickjumplistcategory.cpp4
-rw-r--r--src/imports/winextras/qquickjumplistitem.cpp2
-rw-r--r--src/imports/winextras/qquickthumbnailtoolbar.cpp4
-rw-r--r--src/winextras/qwinfunctions.cpp6
-rw-r--r--src/winextras/qwinfunctions_p.h2
-rw-r--r--src/winextras/qwinjumplist.cpp14
-rw-r--r--src/winextras/qwinjumplistcategory.cpp6
-rw-r--r--src/winextras/qwintaskbarbutton.cpp4
-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
21 files changed, 48 insertions, 48 deletions
diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp
index 7fa5e4d..b72a49a 100644
--- a/examples/winextras/iconextractor/main.cpp
+++ b/examples/winextras/iconextractor/main.cpp
@@ -98,7 +98,7 @@ static QString formatSize(const QSize &size)
static PixmapEntryList extractIcons(const QString &sourceFile, bool large)
{
const QString nativeName = QDir::toNativeSeparators(sourceFile);
- const wchar_t *sourceFileC = reinterpret_cast<const wchar_t *>(nativeName.utf16());
+ const auto *sourceFileC = reinterpret_cast<const wchar_t *>(nativeName.utf16());
const UINT iconCount = ExtractIconEx(sourceFileC, -1, nullptr, nullptr, 0);
if (!iconCount) {
std::wcerr << sourceFile << " does not appear to contain icons.\n";
@@ -180,7 +180,7 @@ static PixmapEntryList extractShellIcons(const QString &sourceFile, bool addOver
};
const QString nativeName = QDir::toNativeSeparators(sourceFile);
- const wchar_t *sourceFileC = reinterpret_cast<const wchar_t *>(nativeName.utf16());
+ const auto *sourceFileC = reinterpret_cast<const wchar_t *>(nativeName.utf16());
SHFILEINFO info;
unsigned int baseFlags = SHGFI_ICON | SHGFI_SYSICONINDEX | SHGFI_ICONLOCATION;
diff --git a/examples/winextras/musicplayer/volumebutton.cpp b/examples/winextras/musicplayer/volumebutton.cpp
index 9cecf08..908dba1 100644
--- a/examples/winextras/musicplayer/volumebutton.cpp
+++ b/examples/winextras/musicplayer/volumebutton.cpp
@@ -77,7 +77,7 @@ VolumeButton::VolumeButton(QWidget *parent) :
popupLayout->addWidget(slider);
popupLayout->addWidget(label);
- QWidgetAction *action = new QWidgetAction(this);
+ auto *action = new QWidgetAction(this);
action->setDefaultWidget(popup);
menu = new QMenu(this);
diff --git a/src/imports/winextras/qquickdwmfeatures.cpp b/src/imports/winextras/qquickdwmfeatures.cpp
index d8f706d..a7ca158 100644
--- a/src/imports/winextras/qquickdwmfeatures.cpp
+++ b/src/imports/winextras/qquickdwmfeatures.cpp
@@ -313,8 +313,8 @@ bool QQuickDwmFeatures::eventFilter(QObject *object, QEvent *event)
QQuickDwmFeatures *QQuickDwmFeatures::qmlAttachedProperties(QObject *parentObject)
{
- QQuickDwmFeatures *featuresObj = new QQuickDwmFeatures();
- QQuickItem *parentItem = qobject_cast<QQuickItem *>(parentObject);
+ auto *featuresObj = new QQuickDwmFeatures();
+ auto *parentItem = qobject_cast<QQuickItem *>(parentObject);
if (parentItem)
featuresObj->setParentItem(parentItem);
else
diff --git a/src/imports/winextras/qquickiconloader.cpp b/src/imports/winextras/qquickiconloader.cpp
index 88b064a..b5b7e5b 100644
--- a/src/imports/winextras/qquickiconloader.cpp
+++ b/src/imports/winextras/qquickiconloader.cpp
@@ -79,7 +79,7 @@ QVariant QQuickIconLoader::loadFromImageProvider(const QUrl &url, const QQmlEngi
const QString providerId = url.host();
const QString imageId = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1);
QQuickImageProvider::ImageType imageType = QQuickImageProvider::Invalid;
- QQuickImageProvider *provider = static_cast<QQuickImageProvider *>(engine->imageProvider(providerId));
+ auto *provider = static_cast<QQuickImageProvider *>(engine->imageProvider(providerId));
QSize size;
if (!requestedSize.isValid())
requestedSize = QSize(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
@@ -122,7 +122,7 @@ QQuickIconLoaderNetworkReplyHandler::QQuickIconLoaderNetworkReplyHandler(QNetwor
void QQuickIconLoaderNetworkReplyHandler::onRequestFinished()
{
- QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
+ auto *reply = qobject_cast<QNetworkReply *>(sender());
Q_ASSERT(reply);
if (reply->error() != QNetworkReply::NoError) {
qWarning() << Q_FUNC_INFO << reply->url() << "failed:" << reply->errorString();
diff --git a/src/imports/winextras/qquickiconloader_p.h b/src/imports/winextras/qquickiconloader_p.h
index a6c97e8..bc23581 100644
--- a/src/imports/winextras/qquickiconloader_p.h
+++ b/src/imports/winextras/qquickiconloader_p.h
@@ -120,7 +120,7 @@ QQuickIconLoader::LoadResult
const QString scheme = url.scheme();
if (scheme.startsWith(QLatin1String("http"))) {
if (QNetworkReply *reply = QQuickIconLoader::loadFromNetwork(url, engine)) {
- QQuickIconLoaderNetworkReplyHandler *handler = new QQuickIconLoaderNetworkReplyHandler(reply, type);
+ auto *handler = new QQuickIconLoaderNetworkReplyHandler(reply, type);
QObject::connect(handler, &QQuickIconLoaderNetworkReplyHandler::finished, receiver, function);
return LoadNetworkRequestStarted;
}
diff --git a/src/imports/winextras/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp
index 96b1074..615af08 100644
--- a/src/imports/winextras/qquickjumplist.cpp
+++ b/src/imports/winextras/qquickjumplist.cpp
@@ -80,7 +80,7 @@ QQuickJumpList::~QQuickJumpList() = default;
QQuickJumpListCategory *QQuickJumpList::recent() const
{
if (!m_recent) {
- QQuickJumpList *that = const_cast<QQuickJumpList *>(this);
+ auto *that = const_cast<QQuickJumpList *>(this);
that->m_recent = new QQuickJumpListCategory(that);
connect(m_recent, &QQuickJumpListCategory::visibilityChanged, that, &QQuickJumpList::rebuild);
m_recent->setVisible(false);
@@ -97,7 +97,7 @@ QQuickJumpListCategory *QQuickJumpList::recent() const
QQuickJumpListCategory *QQuickJumpList::frequent() const
{
if (!m_frequent) {
- QQuickJumpList *that = const_cast<QQuickJumpList *>(this);
+ auto *that = const_cast<QQuickJumpList *>(this);
that->m_frequent = new QQuickJumpListCategory(that);
connect(m_frequent, &QQuickJumpListCategory::visibilityChanged, that, &QQuickJumpList::rebuild);
m_frequent->setVisible(false);
@@ -113,7 +113,7 @@ QQuickJumpListCategory *QQuickJumpList::frequent() const
QQuickJumpListCategory *QQuickJumpList::tasks() const
{
if (!m_tasks) {
- QQuickJumpList *that = const_cast<QQuickJumpList *>(this);
+ auto *that = const_cast<QQuickJumpList *>(this);
that->m_tasks = new QQuickJumpListCategory(that);
connect(m_tasks, &QQuickJumpListCategory::visibilityChanged, that, &QQuickJumpList::rebuild);
}
@@ -180,8 +180,8 @@ void QQuickJumpList::rebuild()
void QQuickJumpList::data_append(QQmlListProperty<QObject> *property, QObject *object)
{
- if (QQuickJumpListCategory *category = qobject_cast<QQuickJumpListCategory *>(object)) {
- QQuickJumpList *jumpList = static_cast<QQuickJumpList *>(property->object);
+ if (auto *category = qobject_cast<QQuickJumpListCategory *>(object)) {
+ auto *jumpList = static_cast<QQuickJumpList *>(property->object);
connect(category, &QQuickJumpListCategory::visibilityChanged, jumpList, &QQuickJumpList::rebuild);
jumpList->m_categories.append(category);
emit jumpList->categoriesChanged();
diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp
index 673d96b..30183f4 100644
--- a/src/imports/winextras/qquickjumplistcategory.cpp
+++ b/src/imports/winextras/qquickjumplistcategory.cpp
@@ -132,8 +132,8 @@ QList<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const
void QQuickJumpListCategory::data_append(QQmlListProperty<QObject> *property, QObject *object)
{
- if (QQuickJumpListItem *item = qobject_cast<QQuickJumpListItem *>(object)) {
- QQuickJumpListCategory *category = static_cast<QQuickJumpListCategory *>(property->object);
+ if (auto *item = qobject_cast<QQuickJumpListItem *>(object)) {
+ auto *category = static_cast<QQuickJumpListCategory *>(property->object);
category->m_items.append(item);
emit category->itemsChanged();
}
diff --git a/src/imports/winextras/qquickjumplistitem.cpp b/src/imports/winextras/qquickjumplistitem.cpp
index bcf0162..bfc9543 100644
--- a/src/imports/winextras/qquickjumplistitem.cpp
+++ b/src/imports/winextras/qquickjumplistitem.cpp
@@ -62,7 +62,7 @@ void QQuickJumpListItem::setType(int type)
QWinJumpListItem *QQuickJumpListItem::toJumpListItem() const
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Separator);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Separator);
switch (m_type) {
case ItemTypeDestination:
item->setType(QWinJumpListItem::Destination);
diff --git a/src/imports/winextras/qquickthumbnailtoolbar.cpp b/src/imports/winextras/qquickthumbnailtoolbar.cpp
index 91ab5bd..7bdf112 100644
--- a/src/imports/winextras/qquickthumbnailtoolbar.cpp
+++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp
@@ -224,8 +224,8 @@ void QQuickThumbnailToolBar::itemChange(QQuickItem::ItemChange change, const QQu
void QQuickThumbnailToolBar::addData(QQmlListProperty<QObject> *property, QObject *object)
{
- if (QQuickThumbnailToolButton *button = qobject_cast<QQuickThumbnailToolButton *>(object)) {
- QQuickThumbnailToolBar *quickThumbbar = static_cast<QQuickThumbnailToolBar *>(property->object);
+ if (auto *button = qobject_cast<QQuickThumbnailToolButton *>(object)) {
+ auto *quickThumbbar = static_cast<QQuickThumbnailToolBar *>(property->object);
quickThumbbar->m_toolbar.addButton(button->m_button);
quickThumbbar->m_buttons.append(button);
emit quickThumbbar->countChanged();
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
index e891ad6..b237a50 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -235,13 +235,13 @@ QRegion QtWin::fromHRGN(HRGN hrgn)
if (regionDataSize == 0)
return QRegion();
- LPRGNDATA regionData = reinterpret_cast<LPRGNDATA>(malloc(regionDataSize));
+ auto regionData = reinterpret_cast<LPRGNDATA>(malloc(regionDataSize));
if (!regionData)
return QRegion();
QRegion region;
if (GetRegionData(hrgn, regionDataSize, regionData) == regionDataSize) {
- LPRECT pRect = reinterpret_cast<LPRECT>(regionData->Buffer);
+ auto pRect = reinterpret_cast<LPRECT>(regionData->Buffer);
for (DWORD i = 0; i < regionData->rdh.nCount; ++i)
region += QRect(pRect[i].left, pRect[i].top,
pRect[i].right - pRect[i].left,
@@ -1623,7 +1623,7 @@ QtWin::WindowFlip3DPolicy QtWin::windowFlip3DPolicy(QWindow *window)
{
Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
- const DWORD value =
+ const auto value =
QtDwmApiDll::windowAttribute<DWORD>(reinterpret_cast<HWND>(window->winId()),
DWMWA_FLIP3D_POLICY, DWORD(DWMFLIP3D_DEFAULT));
QtWin::WindowFlip3DPolicy policy = QtWin::FlipDefault;
diff --git a/src/winextras/qwinfunctions_p.h b/src/winextras/qwinfunctions_p.h
index 03dff5e..0ee73cb 100644
--- a/src/winextras/qwinfunctions_p.h
+++ b/src/winextras/qwinfunctions_p.h
@@ -83,7 +83,7 @@ inline void qt_qstringToNullTerminated(const QString &src, wchar_t *dst)
inline wchar_t *qt_qstringToNullTerminated(const QString &src)
{
- wchar_t *buffer = new wchar_t[src.length() + 1];
+ auto *buffer = new wchar_t[src.length() + 1];
qt_qstringToNullTerminated(src, buffer);
return buffer;
}
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index 92b3ccc..55c99f4 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -281,7 +281,7 @@ IObjectCollection *QWinJumpListPrivate::toComCollection(const QList<QWinJumpList
QWinJumpListItem *QWinJumpListPrivate::fromIShellLink(IShellLinkW *link)
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Link);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Link);
IPropertyStore *linkProps;
link->QueryInterface(qIID_IPropertyStore, reinterpret_cast<void **>(&linkProps));
@@ -309,7 +309,7 @@ QWinJumpListItem *QWinJumpListPrivate::fromIShellLink(IShellLinkW *link)
QWinJumpListItem *QWinJumpListPrivate::fromIShellItem(IShellItem2 *shellitem)
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Destination);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Destination);
wchar_t *strPtr;
shellitem->GetDisplayName(SIGDN_FILESYSPATH, &strPtr);
item->setFilePath(QDir::fromNativeSeparators(QString::fromWCharArray(strPtr)));
@@ -348,7 +348,7 @@ IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item)
qMax(item->description().size(),
qMax(item->title().size(),
qMax(item->filePath().size(), iconPathSize))))) + 1;
- wchar_t *buffer = new wchar_t[bufferSize];
+ auto *buffer = new wchar_t[bufferSize];
if (!item->description().isEmpty()) {
qt_qstringToNullTerminated(item->description(), buffer);
@@ -496,7 +496,7 @@ QWinJumpListCategory *QWinJumpList::recent() const
{
Q_D(const QWinJumpList);
if (!d->recent) {
- QWinJumpList *that = const_cast<QWinJumpList *>(this);
+ auto *that = const_cast<QWinJumpList *>(this);
that->d_func()->recent = QWinJumpListCategoryPrivate::create(QWinJumpListCategory::Recent, that);
}
return d->recent;
@@ -509,7 +509,7 @@ QWinJumpListCategory *QWinJumpList::frequent() const
{
Q_D(const QWinJumpList);
if (!d->frequent) {
- QWinJumpList *that = const_cast<QWinJumpList *>(this);
+ auto *that = const_cast<QWinJumpList *>(this);
that->d_func()->frequent = QWinJumpListCategoryPrivate::create(QWinJumpListCategory::Frequent, that);
}
return d->frequent;
@@ -522,7 +522,7 @@ QWinJumpListCategory *QWinJumpList::tasks() const
{
Q_D(const QWinJumpList);
if (!d->tasks) {
- QWinJumpList *that = const_cast<QWinJumpList *>(this);
+ auto *that = const_cast<QWinJumpList *>(this);
that->d_func()->tasks = QWinJumpListCategoryPrivate::create(QWinJumpListCategory::Tasks, that);
}
return d->tasks;
@@ -558,7 +558,7 @@ void QWinJumpList::addCategory(QWinJumpListCategory *category)
*/
QWinJumpListCategory *QWinJumpList::addCategory(const QString &title, const QList<QWinJumpListItem *> items)
{
- QWinJumpListCategory *category = new QWinJumpListCategory(title);
+ auto *category = new QWinJumpListCategory(title);
for (QWinJumpListItem *item : items)
category->addItem(item);
addCategory(category);
diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp
index 47daacf..a29c37e 100644
--- a/src/winextras/qwinjumplistcategory.cpp
+++ b/src/winextras/qwinjumplistcategory.cpp
@@ -294,7 +294,7 @@ void QWinJumpListCategory::addItem(QWinJumpListItem *item)
*/
QWinJumpListItem *QWinJumpListCategory::addDestination(const QString &filePath)
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Destination);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Destination);
item->setFilePath(filePath);
addItem(item);
return item;
@@ -317,7 +317,7 @@ QWinJumpListItem *QWinJumpListCategory::addLink(const QString &title, const QStr
*/
QWinJumpListItem *QWinJumpListCategory::addLink(const QIcon &icon, const QString &title, const QString &executablePath, const QStringList &arguments)
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Link);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Link);
item->setFilePath(executablePath);
item->setTitle(title);
item->setArguments(arguments);
@@ -333,7 +333,7 @@ QWinJumpListItem *QWinJumpListCategory::addLink(const QIcon &icon, const QString
*/
QWinJumpListItem *QWinJumpListCategory::addSeparator()
{
- QWinJumpListItem *item = new QWinJumpListItem(QWinJumpListItem::Separator);
+ auto *item = new QWinJumpListItem(QWinJumpListItem::Separator);
addItem(item);
return item;
}
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp
index 6f72ef5..9df4c30 100644
--- a/src/winextras/qwintaskbarbutton.cpp
+++ b/src/winextras/qwintaskbarbutton.cpp
@@ -269,8 +269,8 @@ QWinTaskbarProgress *QWinTaskbarButton::progress() const
{
Q_D(const QWinTaskbarButton);
if (!d->progressBar) {
- QWinTaskbarButton *that = const_cast<QWinTaskbarButton *>(this);
- QWinTaskbarProgress *pbar = new QWinTaskbarProgress(that);
+ auto *that = const_cast<QWinTaskbarButton *>(this);
+ auto *pbar = new QWinTaskbarProgress(that);
connect(pbar, SIGNAL(destroyed()), this, SLOT(_q_updateProgress()));
connect(pbar, SIGNAL(valueChanged(int)), this, SLOT(_q_updateProgress()));
connect(pbar, SIGNAL(minimumChanged(int)), this, SLOT(_q_updateProgress()));
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);