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 /src | |
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 'src')
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures.cpp | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquickiconloader.cpp | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquickiconloader_p.h | 2 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplist.cpp | 10 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistcategory.cpp | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistitem.cpp | 2 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar.cpp | 4 | ||||
-rw-r--r-- | src/winextras/qwinfunctions.cpp | 6 | ||||
-rw-r--r-- | src/winextras/qwinfunctions_p.h | 2 | ||||
-rw-r--r-- | src/winextras/qwinjumplist.cpp | 14 | ||||
-rw-r--r-- | src/winextras/qwinjumplistcategory.cpp | 6 | ||||
-rw-r--r-- | src/winextras/qwintaskbarbutton.cpp | 4 |
12 files changed, 31 insertions, 31 deletions
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())); |