diff options
Diffstat (limited to 'src')
33 files changed, 170 insertions, 187 deletions
diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp index f53cdf7..41b3fe8 100644 --- a/src/imports/winextras/plugin.cpp +++ b/src/imports/winextras/plugin.cpp @@ -57,7 +57,7 @@ class QWinExtrasQmlPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QWinExtrasQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } + QWinExtrasQmlPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) Q_DECL_OVERRIDE { Q_ASSERT(uri == QLatin1String("QtWinExtras")); diff --git a/src/imports/winextras/qquickdwmfeatures.cpp b/src/imports/winextras/qquickdwmfeatures.cpp index 5d1f565..a7ca158 100644 --- a/src/imports/winextras/qquickdwmfeatures.cpp +++ b/src/imports/winextras/qquickdwmfeatures.cpp @@ -71,9 +71,7 @@ QQuickDwmFeatures::QQuickDwmFeatures(QQuickItem *parent) : QWinEventFilter::setup(); } -QQuickDwmFeatures::~QQuickDwmFeatures() -{ -} +QQuickDwmFeatures::~QQuickDwmFeatures() = default; void QQuickDwmFeatures::setCompositionEnabled(bool enabled) { @@ -230,10 +228,7 @@ void QQuickDwmFeatures::setBlurBehindEnabled(bool enabled) bool QQuickDwmFeatures::isExcludedFromPeek() const { Q_D(const QQuickDwmFeatures); - if (window()) - return QtWin::isWindowExcludedFromPeek(window()); - else - return d->peekExcluded; + return window() ? QtWin::isWindowExcludedFromPeek(window()) : d->peekExcluded; } void QQuickDwmFeatures::setExcludedFromPeek(bool exclude) @@ -257,10 +252,7 @@ void QQuickDwmFeatures::setExcludedFromPeek(bool exclude) bool QQuickDwmFeatures::isPeekDisallowed() const { Q_D(const QQuickDwmFeatures); - if (window()) - return QtWin::isWindowPeekDisallowed(window()); - else - return d->peekDisallowed; + return window() ? QtWin::isWindowPeekDisallowed(window()) : d->peekDisallowed; } void QQuickDwmFeatures::setPeekDisallowed(bool disallow) @@ -321,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 @@ -344,9 +336,6 @@ void QQuickDwmFeatures::itemChange(QQuickItem::ItemChange change, const QQuickIt QQuickDwmFeaturesPrivate::QQuickDwmFeaturesPrivate(QQuickDwmFeatures *parent) : - topMargin(0), rightMargin(0), bottomMargin(0), leftMargin(0), - blurBehindEnabled(false), - peekDisallowed(false), peekExcluded(false), flipPolicy(QQuickWin::FlipDefault), q_ptr(parent) { } diff --git a/src/imports/winextras/qquickdwmfeatures_p.h b/src/imports/winextras/qquickdwmfeatures_p.h index a10a49b..d98aa00 100644 --- a/src/imports/winextras/qquickdwmfeatures_p.h +++ b/src/imports/winextras/qquickdwmfeatures_p.h @@ -79,7 +79,7 @@ class QQuickDwmFeatures : public QQuickItem Q_PROPERTY(QQuickWin::WindowFlip3DPolicy flip3DPolicy READ flip3DPolicy WRITE setFlip3DPolicy NOTIFY flip3DPolicyChanged) public: - explicit QQuickDwmFeatures(QQuickItem *parent = 0); + explicit QQuickDwmFeatures(QQuickItem *parent = nullptr); ~QQuickDwmFeatures(); void setCompositionEnabled(bool enabled); diff --git a/src/imports/winextras/qquickdwmfeatures_p_p.h b/src/imports/winextras/qquickdwmfeatures_p_p.h index fc8bbb7..4ec1244 100644 --- a/src/imports/winextras/qquickdwmfeatures_p_p.h +++ b/src/imports/winextras/qquickdwmfeatures_p_p.h @@ -61,15 +61,15 @@ class QQuickDwmFeaturesPrivate public: QQuickDwmFeaturesPrivate(QQuickDwmFeatures *parent); - int topMargin; - int rightMargin; - int bottomMargin; - int leftMargin; - bool blurBehindEnabled; + int topMargin = 0; + int rightMargin = 0; + int bottomMargin = 0; + int leftMargin = 0; + bool blurBehindEnabled = false; - bool peekDisallowed; - bool peekExcluded; - QQuickWin::WindowFlip3DPolicy flipPolicy; + bool peekDisallowed = false; + bool peekExcluded = false; + QQuickWin::WindowFlip3DPolicy flipPolicy = QQuickWin::FlipDefault; QColor originalSurfaceColor; void updateAll(); diff --git a/src/imports/winextras/qquickiconloader.cpp b/src/imports/winextras/qquickiconloader.cpp index df9a19d..b5b7e5b 100644 --- a/src/imports/winextras/qquickiconloader.cpp +++ b/src/imports/winextras/qquickiconloader.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QVariant QQuickIconLoader::loadFromFile(const QUrl &url, QVariant::Type type) { const QString path = QQmlFile::urlToLocalFileOrQrc(url); - if (QFileInfo(path).exists()) { + if (QFileInfo::exists(path)) { switch (type) { case QMetaType::QIcon: return QVariant(QIcon(path)); @@ -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 ad359ee..bc23581 100644 --- a/src/imports/winextras/qquickiconloader_p.h +++ b/src/imports/winextras/qquickiconloader_p.h @@ -86,7 +86,7 @@ public: Object *receiver, void (Object::*function)(const QVariant &)); private: - QQuickIconLoader() {} + QQuickIconLoader() = default; static QVariant loadFromFile(const QUrl &url, QVariant::Type type); static QVariant loadFromImageProvider(const QUrl &url, const QQmlEngine *engine, QVariant::Type type, QSize requestedSize); @@ -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 0f210c7..615af08 100644 --- a/src/imports/winextras/qquickjumplist.cpp +++ b/src/imports/winextras/qquickjumplist.cpp @@ -65,13 +65,11 @@ QT_BEGIN_NAMESPACE */ QQuickJumpList::QQuickJumpList(QObject *parent) : - QObject(parent), m_recent(0), m_frequent(0), m_tasks(0) + QObject(parent) { } -QQuickJumpList::~QQuickJumpList() -{ -} +QQuickJumpList::~QQuickJumpList() = default; /*! \qmlproperty JumpListCategory JumpList::recent @@ -82,7 +80,7 @@ QQuickJumpList::~QQuickJumpList() 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); @@ -99,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); @@ -115,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); } @@ -141,7 +139,7 @@ void QQuickJumpList::setTasks(QQuickJumpListCategory *tasks) */ QQmlListProperty<QObject> QQuickJumpList::data() { - return QQmlListProperty<QObject>(this, this, &QQuickJumpList::data_append, 0, 0, 0); + return QQmlListProperty<QObject>(this, this, &QQuickJumpList::data_append, nullptr, nullptr, nullptr); } /*! @@ -182,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/qquickjumplist_p.h b/src/imports/winextras/qquickjumplist_p.h index 8efb2bc..c686294 100644 --- a/src/imports/winextras/qquickjumplist_p.h +++ b/src/imports/winextras/qquickjumplist_p.h @@ -72,7 +72,7 @@ class QQuickJumpList : public QObject, public QQmlParserStatus Q_INTERFACES(QQmlParserStatus) public: - explicit QQuickJumpList(QObject *parent = 0); + explicit QQuickJumpList(QObject *parent = nullptr); ~QQuickJumpList(); QQuickJumpListCategory *recent() const; @@ -84,8 +84,8 @@ public: QQmlListProperty<QObject> data(); QQmlListProperty<QQuickJumpListCategory> categories(); - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void tasksChanged(); @@ -99,9 +99,9 @@ private: static int categories_count(QQmlListProperty<QQuickJumpListCategory> *property); static QQuickJumpListCategory *categories_at(QQmlListProperty<QQuickJumpListCategory> *property, int index); - QQuickJumpListCategory *m_recent; - QQuickJumpListCategory *m_frequent; - QQuickJumpListCategory *m_tasks; + QQuickJumpListCategory *m_recent = nullptr; + QQuickJumpListCategory *m_frequent = nullptr; + QQuickJumpListCategory *m_tasks = nullptr; QList<QQuickJumpListCategory *> m_categories; }; diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp index 052a4e6..30183f4 100644 --- a/src/imports/winextras/qquickjumplistcategory.cpp +++ b/src/imports/winextras/qquickjumplistcategory.cpp @@ -61,13 +61,11 @@ QT_BEGIN_NAMESPACE */ QQuickJumpListCategory::QQuickJumpListCategory(QObject *parent) : - QObject(parent), m_visible(true) + QObject(parent) { } -QQuickJumpListCategory::~QQuickJumpListCategory() -{ -} +QQuickJumpListCategory::~QQuickJumpListCategory() = default; /*! \qmlproperty list<QtObject> JumpListCategory::data @@ -75,7 +73,7 @@ QQuickJumpListCategory::~QQuickJumpListCategory() */ QQmlListProperty<QObject> QQuickJumpListCategory::data() { - return QQmlListProperty<QObject>(this, this, &QQuickJumpListCategory::data_append, 0, 0, 0); + return QQmlListProperty<QObject>(this, this, &QQuickJumpListCategory::data_append, nullptr, nullptr, nullptr); } /*! @@ -134,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/qquickjumplistcategory_p.h b/src/imports/winextras/qquickjumplistcategory_p.h index 9ae4922..69663f8 100644 --- a/src/imports/winextras/qquickjumplistcategory_p.h +++ b/src/imports/winextras/qquickjumplistcategory_p.h @@ -71,7 +71,7 @@ class QQuickJumpListCategory : public QObject Q_CLASSINFO("DefaultProperty", "data") public: - explicit QQuickJumpListCategory(QObject *parent = 0); + explicit QQuickJumpListCategory(QObject *parent = nullptr); ~QQuickJumpListCategory(); QString title() const; @@ -95,7 +95,7 @@ private: static int items_count(QQmlListProperty<QQuickJumpListItem> *property); static QQuickJumpListItem *items_at(QQmlListProperty<QQuickJumpListItem> *property, int index); - bool m_visible; + bool m_visible = true; QString m_title; QList<QQuickJumpListItem *> m_items; }; diff --git a/src/imports/winextras/qquickjumplistitem.cpp b/src/imports/winextras/qquickjumplistitem.cpp index 86b917a..bfc9543 100644 --- a/src/imports/winextras/qquickjumplistitem.cpp +++ b/src/imports/winextras/qquickjumplistitem.cpp @@ -48,9 +48,7 @@ QQuickJumpListItem::QQuickJumpListItem(QObject *parent) : { } -QQuickJumpListItem::~QQuickJumpListItem() -{ -} +QQuickJumpListItem::~QQuickJumpListItem() = default; int QQuickJumpListItem::type() const { @@ -64,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/qquickjumplistitem_p.h b/src/imports/winextras/qquickjumplistitem_p.h index a202c41..47d92d7 100644 --- a/src/imports/winextras/qquickjumplistitem_p.h +++ b/src/imports/winextras/qquickjumplistitem_p.h @@ -61,16 +61,15 @@ class QQuickJumpListItem : public QObject { Q_OBJECT Q_PROPERTY(int __jumpListItemType READ type WRITE setType) - Q_ENUMS(JumpListItemType) - public: enum JumpListItemType { ItemTypeLink = 1, ItemTypeDestination = 2, ItemTypeSeparator = 3 }; + Q_ENUM(JumpListItemType) - explicit QQuickJumpListItem(QObject *p = 0); + explicit QQuickJumpListItem(QObject *p = nullptr); ~QQuickJumpListItem(); int type() const; diff --git a/src/imports/winextras/qquicktaskbarbutton.cpp b/src/imports/winextras/qquicktaskbarbutton.cpp index 7e8fd88..688ef35 100644 --- a/src/imports/winextras/qquicktaskbarbutton.cpp +++ b/src/imports/winextras/qquicktaskbarbutton.cpp @@ -123,9 +123,7 @@ QQuickTaskbarButton::QQuickTaskbarButton(QQuickItem *parent) : QQuickItem(parent { } -QQuickTaskbarButton::~QQuickTaskbarButton() -{ -} +QQuickTaskbarButton::~QQuickTaskbarButton() = default; /*! \qmlpropertygroup ::TaskbarButton::progress diff --git a/src/imports/winextras/qquicktaskbarbutton_p.h b/src/imports/winextras/qquicktaskbarbutton_p.h index 3c34c53..a26fa67 100644 --- a/src/imports/winextras/qquicktaskbarbutton_p.h +++ b/src/imports/winextras/qquicktaskbarbutton_p.h @@ -68,7 +68,7 @@ class QQuickTaskbarOverlay : public QObject Q_PROPERTY(QString accessibleDescription READ accessibleDescription WRITE setAccessibleDescription NOTIFY accessibleDescriptionChanged) public: - explicit QQuickTaskbarOverlay(QWinTaskbarButton *button, QObject *parent = 0); + explicit QQuickTaskbarOverlay(QWinTaskbarButton *button, QObject *parent = nullptr); QUrl iconSource() const; void setIconSource(const QUrl &iconSource); @@ -95,7 +95,7 @@ class QQuickTaskbarButton : public QQuickItem Q_PROPERTY(QWinTaskbarProgress *progress READ progress CONSTANT) public: - explicit QQuickTaskbarButton(QQuickItem *parent = 0); + explicit QQuickTaskbarButton(QQuickItem *parent = nullptr); ~QQuickTaskbarButton(); QQuickTaskbarOverlay *overlay() const; diff --git a/src/imports/winextras/qquickthumbnailtoolbar.cpp b/src/imports/winextras/qquickthumbnailtoolbar.cpp index 00eb1b5..7bdf112 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp @@ -74,9 +74,7 @@ QQuickThumbnailToolBar::QQuickThumbnailToolBar(QQuickItem *parent) : this, &QQuickThumbnailToolBar::iconicLivePreviewRequested); } -QQuickThumbnailToolBar::~QQuickThumbnailToolBar() -{ -} +QQuickThumbnailToolBar::~QQuickThumbnailToolBar() = default; int QQuickThumbnailToolBar::count() const { @@ -85,12 +83,12 @@ int QQuickThumbnailToolBar::count() const QQmlListProperty<QObject> QQuickThumbnailToolBar::data() { - return QQmlListProperty<QObject>(this, 0, &QQuickThumbnailToolBar::addData, 0, 0, 0); + return QQmlListProperty<QObject>(this, nullptr, &QQuickThumbnailToolBar::addData, nullptr, nullptr, nullptr); } QQmlListProperty<QQuickThumbnailToolButton> QQuickThumbnailToolBar::buttons() { - return QQmlListProperty<QQuickThumbnailToolButton>(this, 0, &QQuickThumbnailToolBar::buttonCount, &QQuickThumbnailToolBar::buttonAt); + return QQmlListProperty<QQuickThumbnailToolButton>(this, nullptr, &QQuickThumbnailToolBar::buttonCount, &QQuickThumbnailToolBar::buttonAt); } void QQuickThumbnailToolBar::addButton(QQuickThumbnailToolButton *button) @@ -226,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/imports/winextras/qquickthumbnailtoolbar_p.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h index 2b01849..12a9d27 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar_p.h +++ b/src/imports/winextras/qquickthumbnailtoolbar_p.h @@ -74,7 +74,7 @@ class QQuickThumbnailToolBar : public QQuickItem Q_CLASSINFO("DefaultProperty", "data") public: - explicit QQuickThumbnailToolBar(QQuickItem *parent = 0); + explicit QQuickThumbnailToolBar(QQuickItem *parent = nullptr); ~QQuickThumbnailToolBar(); int count() const; @@ -109,7 +109,7 @@ private Q_SLOTS: void iconicLivePreviewLoaded(const QVariant &); protected: - void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data); + void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override; private: static void addData(QQmlListProperty<QObject> *property, QObject *button); diff --git a/src/imports/winextras/qquickthumbnailtoolbutton.cpp b/src/imports/winextras/qquickthumbnailtoolbutton.cpp index 268b303..e4a1f81 100644 --- a/src/imports/winextras/qquickthumbnailtoolbutton.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbutton.cpp @@ -67,9 +67,7 @@ QQuickThumbnailToolButton::QQuickThumbnailToolButton(QObject *parent) : connect(m_button, &QWinThumbnailToolButton::clicked, this, &QQuickThumbnailToolButton::clicked); } -QQuickThumbnailToolButton::~QQuickThumbnailToolButton() -{ -} +QQuickThumbnailToolButton::~QQuickThumbnailToolButton() = default; /*! \qmlproperty url ThumbnailToolButton::iconSource diff --git a/src/imports/winextras/qquickthumbnailtoolbutton_p.h b/src/imports/winextras/qquickthumbnailtoolbutton_p.h index 4fff55a..aca0e74 100644 --- a/src/imports/winextras/qquickthumbnailtoolbutton_p.h +++ b/src/imports/winextras/qquickthumbnailtoolbutton_p.h @@ -70,7 +70,7 @@ class QQuickThumbnailToolButton : public QObject Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged) public: - explicit QQuickThumbnailToolButton(QObject *parent = 0); + explicit QQuickThumbnailToolButton(QObject *parent = nullptr); ~QQuickThumbnailToolButton(); void setIconSource(const QUrl &iconSource); diff --git a/src/imports/winextras/winextras.pro b/src/imports/winextras/winextras.pro index 35427ba..dc778e6 100644 --- a/src/imports/winextras/winextras.pro +++ b/src/imports/winextras/winextras.pro @@ -5,8 +5,6 @@ IMPORT_VERSION = 1.$$QT_MINOR_VERSION QT += qml quick winextras winextras-private -DEFINES += QT_NO_FOREACH - QML_FILES += \ JumpListLink.qml \ JumpListDestination.qml \ diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp index be9add4..4b88f54 100644 --- a/src/winextras/qwineventfilter.cpp +++ b/src/winextras/qwineventfilter.cpp @@ -51,7 +51,7 @@ # define WM_DWMCOMPOSITIONCHANGED 0x031E #endif -QWinEventFilter *QWinEventFilter::instance = 0; +QWinEventFilter *QWinEventFilter::instance = nullptr; QWinEventFilter::QWinEventFilter() : tbButtonCreatedMsgId(RegisterWindowMessageW(L"TaskbarButtonCreated")) @@ -60,16 +60,20 @@ QWinEventFilter::QWinEventFilter() : QWinEventFilter::~QWinEventFilter() { - instance = 0; + instance = nullptr; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, qintptr *result) +#else bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long *result) +#endif { MSG *msg = static_cast<MSG *>(message); bool filterOut = false; - QEvent *event = 0; - QWindow *window = 0; + QEvent *event = nullptr; + QWindow *window = nullptr; switch (msg->message) { case WM_DWMCOLORIZATIONCOLORCHANGED : event = new QWinColorizationChangeEvent(QRgb(msg->wParam), msg->lParam); diff --git a/src/winextras/qwineventfilter_p.h b/src/winextras/qwineventfilter_p.h index 12b9d58..ad37177 100644 --- a/src/winextras/qwineventfilter_p.h +++ b/src/winextras/qwineventfilter_p.h @@ -64,7 +64,11 @@ class Q_WINEXTRAS_EXPORT QWinEventFilter : public QAbstractNativeEventFilter public: QWinEventFilter(); ~QWinEventFilter(); - virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; +#endif static void setup(); diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp index 82fd25b..b237a50 100644 --- a/src/winextras/qwinfunctions.cpp +++ b/src/winextras/qwinfunctions.cpp @@ -209,9 +209,9 @@ HRGN QtWin::toHRGN(const QRegion ®ion) { const int size = region.rectCount(); if (size == 0) - return 0; + return nullptr; - HRGN resultRgn = 0; + HRGN resultRgn = nullptr; const auto rects = region.begin(); resultRgn = qt_RectToHRGN(rects[0]); for (int i = 1; i < size; i++) { @@ -231,17 +231,17 @@ HRGN QtWin::toHRGN(const QRegion ®ion) */ QRegion QtWin::fromHRGN(HRGN hrgn) { - DWORD regionDataSize = GetRegionData(hrgn, 0, NULL); + DWORD regionDataSize = GetRegionData(hrgn, 0, nullptr); 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; @@ -1738,10 +1738,10 @@ void QtWin::enableBlurBehindWindow(QWindow *window, const QRegion ®ion) { Q_ASSERT_X(window, Q_FUNC_INFO, "window is null"); - DWM_BLURBEHIND dwmbb = {0, 0, 0, 0}; + DWM_BLURBEHIND dwmbb = {0, 0, nullptr, 0}; dwmbb.dwFlags = DWM_BB_ENABLE; dwmbb.fEnable = TRUE; - HRGN rgn = 0; + HRGN rgn = nullptr; if (!region.isNull()) { rgn = toHRGN(region); if (rgn) { @@ -1788,7 +1788,7 @@ void QtWin::enableBlurBehindWindow(QWindow *window) void QtWin::disableBlurBehindWindow(QWindow *window) { Q_ASSERT_X(window, Q_FUNC_INFO, "window is null"); - DWM_BLURBEHIND dwmbb = {0, 0, 0, 0}; + DWM_BLURBEHIND dwmbb = {0, 0, nullptr, 0}; dwmbb.dwFlags = DWM_BB_ENABLE; DwmEnableBlurBehindWindow(reinterpret_cast<HWND>(window->winId()), &dwmbb); } @@ -1859,12 +1859,12 @@ void QtWin::setCurrentProcessExplicitAppUserModelID(const QString &id) */ ITaskbarList3 *qt_createITaskbarList3() { - ITaskbarList3 *pTbList = 0; - HRESULT result = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList3, reinterpret_cast<void **>(&pTbList)); + ITaskbarList3 *pTbList = nullptr; + HRESULT result = CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, qIID_ITaskbarList3, reinterpret_cast<void **>(&pTbList)); if (SUCCEEDED(result)) { if (FAILED(pTbList->HrInit())) { pTbList->Release(); - pTbList = 0; + pTbList = nullptr; } } return pTbList; @@ -1875,12 +1875,12 @@ ITaskbarList3 *qt_createITaskbarList3() */ ITaskbarList2 *qt_createITaskbarList2() { - ITaskbarList3 *pTbList = 0; - HRESULT result = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList2, reinterpret_cast<void **>(&pTbList)); + ITaskbarList3 *pTbList = nullptr; + HRESULT result = CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, qIID_ITaskbarList2, reinterpret_cast<void **>(&pTbList)); if (SUCCEEDED(result)) { if (FAILED(pTbList->HrInit())) { pTbList->Release(); - pTbList = 0; + pTbList = nullptr; } } return pTbList; diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h index fe461d1..ef2aece 100644 --- a/src/winextras/qwinfunctions.h +++ b/src/winextras/qwinfunctions.h @@ -131,10 +131,8 @@ namespace QtWin inline bool isWindowExcludedFromPeek(QWidget *window) { - if (!window->windowHandle()) - return false; - else - return isWindowExcludedFromPeek(window->windowHandle()); + auto handle = window->windowHandle(); + return handle && isWindowExcludedFromPeek(handle); } inline void setWindowDisallowPeek(QWidget *window, bool disallow) @@ -145,10 +143,8 @@ namespace QtWin inline bool isWindowPeekDisallowed(QWidget *window) { - if (!window->windowHandle()) - return false; - else - return isWindowPeekDisallowed(window->windowHandle()); + auto handle = window->windowHandle(); + return handle && isWindowPeekDisallowed(handle); } inline void setWindowFlip3DPolicy(QWidget *window, WindowFlip3DPolicy policy) 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 ca1b20a..55c99f4 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -159,11 +159,11 @@ void QWinJumpListPrivate::_q_rebuild() void QWinJumpListPrivate::destroy() { delete recent; - recent = 0; + recent = nullptr; delete frequent; - frequent = 0; + frequent = nullptr; delete tasks; - tasks = 0; + tasks = nullptr; qDeleteAll(categories); categories.clear(); invalidate(); @@ -179,7 +179,7 @@ bool QWinJumpListPrivate::beginList() } if (SUCCEEDED(hresult)) { UINT maxSlots = 0; - IUnknown *array = 0; + IUnknown *array = nullptr; hresult = pDestList->BeginList(&maxSlots, qIID_IUnknown, reinterpret_cast<void **>(&array)); if (array) array->Release(); @@ -234,15 +234,15 @@ QList<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *a UINT count = 0; array->GetCount(&count); for (UINT i = 0; i < count; ++i) { - IUnknown *collectionItem = 0; + IUnknown *collectionItem = nullptr; HRESULT hresult = array->GetAt(i, qIID_IUnknown, reinterpret_cast<void **>(&collectionItem)); if (FAILED(hresult)) { QWinJumpListPrivate::warning("GetAt", hresult); continue; } - IShellItem2 *shellItem = 0; - IShellLinkW *shellLink = 0; - QWinJumpListItem *jumplistItem = 0; + IShellItem2 *shellItem = nullptr; + IShellLinkW *shellLink = nullptr; + QWinJumpListItem *jumplistItem = nullptr; if (SUCCEEDED(collectionItem->QueryInterface(qIID_IShellItem2, reinterpret_cast<void **>(&shellItem)))) { jumplistItem = fromIShellItem(shellItem); shellItem->Release(); @@ -262,12 +262,12 @@ QList<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *a IObjectCollection *QWinJumpListPrivate::toComCollection(const QList<QWinJumpListItem *> &list) { if (list.isEmpty()) - return 0; - IObjectCollection *collection = 0; - HRESULT hresult = CoCreateInstance(qCLSID_EnumerableObjectCollection, 0, CLSCTX_INPROC_SERVER, qIID_IObjectCollection, reinterpret_cast<void **>(&collection)); + return nullptr; + IObjectCollection *collection = nullptr; + HRESULT hresult = CoCreateInstance(qCLSID_EnumerableObjectCollection, nullptr, CLSCTX_INPROC_SERVER, qIID_IObjectCollection, reinterpret_cast<void **>(&collection)); if (FAILED(hresult)) { QWinJumpListPrivate::warning("QWinJumpList: failed to instantiate IObjectCollection", hresult); - return 0; + return nullptr; } for (QWinJumpListItem *item : list) { IUnknown *iitem = toICustomDestinationListItem(item); @@ -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))); @@ -327,17 +327,17 @@ IUnknown *QWinJumpListPrivate::toICustomDestinationListItem(const QWinJumpListIt case QWinJumpListItem::Separator : return makeSeparatorShellItem(); default: - return 0; + return nullptr; } } IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item) { - IShellLinkW *link = 0; - HRESULT hresult = CoCreateInstance(CLSID_ShellLink, 0, CLSCTX_INPROC_SERVER, qIID_IShellLinkW, reinterpret_cast<void **>(&link)); + IShellLinkW *link = nullptr; + HRESULT hresult = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, qIID_IShellLinkW, reinterpret_cast<void **>(&link)); if (FAILED(hresult)) { QWinJumpListPrivate::warning("QWinJumpList: failed to instantiate IShellLinkW", hresult); - return 0; + return nullptr; } const QString args = createArguments(item->arguments()); @@ -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); @@ -380,7 +380,7 @@ IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item) hresult = link->QueryInterface(qIID_IPropertyStore, reinterpret_cast<void **>(&properties)); if (FAILED(hresult)) { link->Release(); - return 0; + return nullptr; } qt_qstringToNullTerminated(item->title(), buffer); @@ -396,24 +396,24 @@ IShellLinkW *QWinJumpListPrivate::toIShellLink(const QWinJumpListItem *item) IShellItem2 *QWinJumpListPrivate::toIShellItem(const QWinJumpListItem *item) { - IShellItem2 *shellitem = 0; + IShellItem2 *shellitem = nullptr; QScopedArrayPointer<wchar_t> buffer(qt_qstringToNullTerminated(item->filePath())); - SHCreateItemFromParsingName(buffer.data(), 0, qIID_IShellItem2, reinterpret_cast<void **>(&shellitem)); + SHCreateItemFromParsingName(buffer.data(), nullptr, qIID_IShellItem2, reinterpret_cast<void **>(&shellitem)); return shellitem; } IShellLinkW *QWinJumpListPrivate::makeSeparatorShellItem() { IShellLinkW *separator; - HRESULT res = CoCreateInstance(CLSID_ShellLink, 0, CLSCTX_INPROC_SERVER, qIID_IShellLinkW, reinterpret_cast<void **>(&separator)); + HRESULT res = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, qIID_IShellLinkW, reinterpret_cast<void **>(&separator)); if (FAILED(res)) - return 0; + return nullptr; IPropertyStore *properties; res = separator->QueryInterface(qIID_IPropertyStore, reinterpret_cast<void **>(&properties)); if (FAILED(res)) { separator->Release(); - return 0; + return nullptr; } PROPVARIANT isSeparator; @@ -434,7 +434,7 @@ QWinJumpList::QWinJumpList(QObject *parent) : { Q_D(QWinJumpList); d->q_ptr = this; - HRESULT hresult = CoCreateInstance(qCLSID_DestinationList, 0, CLSCTX_INPROC_SERVER, qIID_ICustomDestinationList, reinterpret_cast<void **>(&d_ptr->pDestList)); + HRESULT hresult = CoCreateInstance(qCLSID_DestinationList, nullptr, CLSCTX_INPROC_SERVER, qIID_ICustomDestinationList, reinterpret_cast<void **>(&d_ptr->pDestList)); if (FAILED(hresult)) QWinJumpListPrivate::warning("CoCreateInstance", hresult); d->invalidate(); @@ -450,7 +450,7 @@ QWinJumpList::~QWinJumpList() d->_q_rebuild(); if (d->pDestList) { d->pDestList->Release(); - d->pDestList = 0; + d->pDestList = nullptr; } d->destroy(); } @@ -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 721a78c..a29c37e 100644 --- a/src/winextras/qwinjumplistcategory.cpp +++ b/src/winextras/qwinjumplistcategory.cpp @@ -104,8 +104,8 @@ void QWinJumpListCategoryPrivate::invalidate() void QWinJumpListCategoryPrivate::loadRecents() { Q_ASSERT(jumpList); - IApplicationDocumentLists *pDocList = 0; - HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDocumentLists, 0, CLSCTX_INPROC_SERVER, qIID_IApplicationDocumentLists, reinterpret_cast<void **>(&pDocList)); + IApplicationDocumentLists *pDocList = nullptr; + HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDocumentLists, nullptr, CLSCTX_INPROC_SERVER, qIID_IApplicationDocumentLists, reinterpret_cast<void **>(&pDocList)); if (SUCCEEDED(hresult)) { if (!jumpList->identifier().isEmpty()) { wchar_t *id = qt_qstringToNullTerminated(jumpList->identifier()); @@ -113,7 +113,7 @@ void QWinJumpListCategoryPrivate::loadRecents() delete[] id; } if (SUCCEEDED(hresult)) { - IObjectArray *array = 0; + IObjectArray *array = nullptr; hresult = pDocList->GetList(type == QWinJumpListCategory::Recent ? ADLT_RECENT : ADLT_FREQUENT, 0, qIID_IObjectArray, reinterpret_cast<void **>(&array)); if (SUCCEEDED(hresult)) { @@ -130,7 +130,7 @@ void QWinJumpListCategoryPrivate::loadRecents() void QWinJumpListCategoryPrivate::addRecent(QWinJumpListItem *item) { Q_ASSERT(item->type() == QWinJumpListItem::Link); - wchar_t *id = 0; + wchar_t *id = nullptr; if (jumpList && !jumpList->identifier().isEmpty()) id = qt_qstringToNullTerminated(jumpList->identifier()); @@ -146,8 +146,8 @@ void QWinJumpListCategoryPrivate::addRecent(QWinJumpListItem *item) void QWinJumpListCategoryPrivate::clearRecents() { - IApplicationDestinations *pDest = 0; - HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDestinations, 0, CLSCTX_INPROC_SERVER, qIID_IApplicationDestinations, reinterpret_cast<void **>(&pDest)); + IApplicationDestinations *pDest = nullptr; + HRESULT hresult = CoCreateInstance(qCLSID_ApplicationDestinations, nullptr, CLSCTX_INPROC_SERVER, qIID_IApplicationDestinations, reinterpret_cast<void **>(&pDest)); if (SUCCEEDED(hresult)) { const QString identifier = jumpList ? jumpList->identifier() : QString(); if (!identifier.isEmpty()) { @@ -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/qwinjumplistitem.cpp b/src/winextras/qwinjumplistitem.cpp index 6c183ec..ee117bc 100644 --- a/src/winextras/qwinjumplistitem.cpp +++ b/src/winextras/qwinjumplistitem.cpp @@ -80,7 +80,7 @@ QWinJumpListItem::QWinJumpListItem(QWinJumpListItem::Type type) : d_ptr(new QWinJumpListItemPrivate) { d_ptr->type = type; - d_ptr->category = 0; + d_ptr->category = nullptr; } /*! diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index a1475d3..9df4c30 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -100,16 +100,16 @@ static TBPFLAG nativeProgressState(QWinTaskbarProgress *progress) return TBPF_NORMAL; } -QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate() : progressBar(0), pTbList(0), window(0) +QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate() { - HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&pTbList)); + HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&pTbList)); if (FAILED(hresult)) { - pTbList = 0; + pTbList = nullptr; const QString err = QtWin::errorStringFromHresult(hresult); qWarning("QWinTaskbarButton: qIID_ITaskbarList4 was not created: %#010x, %s.", unsigned(hresult), qPrintable(err)); } else if (FAILED(pTbList->HrInit())) { pTbList->Release(); - pTbList = 0; + pTbList = nullptr; const QString err = QtWin::errorStringFromHresult(hresult); qWarning("QWinTaskbarButton: qIID_ITaskbarList4 was not initialized: %#010x, %s.", unsigned(hresult), qPrintable(err)); } @@ -136,8 +136,8 @@ void QWinTaskbarButtonPrivate::updateOverlayIcon() if (!pTbList || !window) return; - wchar_t *descrPtr = 0; - HICON hicon = 0; + wchar_t *descrPtr = nullptr; + HICON hicon = nullptr; if (!overlayAccessibleDescription.isEmpty()) descrPtr = qt_qstringToNullTerminated(overlayAccessibleDescription); if (!overlayIcon.isNull()) @@ -146,9 +146,9 @@ void QWinTaskbarButtonPrivate::updateOverlayIcon() if (hicon) pTbList->SetOverlayIcon(handle(), hicon, descrPtr); else if (!hicon && !overlayIcon.isNull()) - pTbList->SetOverlayIcon(handle(), static_cast<HICON>(LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED)), descrPtr); + pTbList->SetOverlayIcon(handle(), static_cast<HICON>(LoadImage(nullptr, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED)), descrPtr); else - pTbList->SetOverlayIcon(handle(), NULL, descrPtr); + pTbList->SetOverlayIcon(handle(), nullptr, descrPtr); if (hicon) DestroyIcon(hicon); @@ -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/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h index dc4d469..627beee 100644 --- a/src/winextras/qwintaskbarbutton.h +++ b/src/winextras/qwintaskbarbutton.h @@ -70,7 +70,7 @@ public: QWinTaskbarProgress *progress() const; - bool eventFilter(QObject *, QEvent *); + bool eventFilter(QObject *, QEvent *) override; public Q_SLOTS: void setOverlayIcon(const QIcon &icon); diff --git a/src/winextras/qwintaskbarbutton_p.h b/src/winextras/qwintaskbarbutton_p.h index ceafe47..e5445b2 100644 --- a/src/winextras/qwintaskbarbutton_p.h +++ b/src/winextras/qwintaskbarbutton_p.h @@ -80,8 +80,8 @@ public: void _q_updateProgress(); - ITaskbarList4 *pTbList; - QWindow *window; + ITaskbarList4 *pTbList = nullptr; + QWindow *window = nullptr; }; QT_END_NAMESPACE diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index 3aa39b6..fc8d76e 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -185,7 +185,7 @@ void QWinThumbnailToolBar::removeButton(QWinThumbnailToolButton *button) { Q_D(QWinThumbnailToolBar); if (button && d->buttonList.contains(button)) { - button->d_func()->toolbar = 0; + button->d_func()->toolbar = nullptr; disconnect(button, &QWinThumbnailToolButton::changed, d, &QWinThumbnailToolBarPrivate::_q_scheduleUpdate); @@ -259,7 +259,7 @@ void QWinThumbnailToolBarPrivate::IconicPixmapCache::deleteBitmap() if (m_bitmap) { DeleteObject(m_bitmap); m_size = QSize(); - m_bitmap = 0; + m_bitmap = nullptr; } } @@ -275,7 +275,7 @@ bool QWinThumbnailToolBarPrivate::IconicPixmapCache::setPixmap(const QPixmap &pi HBITMAP QWinThumbnailToolBarPrivate::IconicPixmapCache::bitmap(const QSize &maxSize) { if (m_pixmap.isNull()) - return 0; + return nullptr; if (m_bitmap && m_size.width() <= maxSize.width() && m_size.height() <= maxSize.height()) return m_bitmap; deleteBitmap(); @@ -421,13 +421,13 @@ void QWinThumbnailToolBar::clear() static inline ITaskbarList4 *createTaskbarList() { - ITaskbarList4 *result = 0; - HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&result)); + ITaskbarList4 *result = nullptr; + HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, qIID_ITaskbarList4, reinterpret_cast<void **>(&result)); if (FAILED(hresult)) { const QString err = QtWin::errorStringFromHresult(hresult); qWarning("QWinThumbnailToolBar: qIID_ITaskbarList4 was not created: %#010x, %s.", unsigned(hresult), qPrintable(err)); - return 0; + return nullptr; } hresult = result->HrInit(); if (FAILED(hresult)) { @@ -435,14 +435,13 @@ static inline ITaskbarList4 *createTaskbarList() const QString err = QtWin::errorStringFromHresult(hresult); qWarning("QWinThumbnailToolBar: qIID_ITaskbarList4 was not initialized: %#010x, %s.", unsigned(hresult), qPrintable(err)); - return 0; + return nullptr; } return result; } QWinThumbnailToolBarPrivate::QWinThumbnailToolBarPrivate() : - QObject(0), updateScheduled(false), window(0), pTbList(createTaskbarList()), q_ptr(0), - withinIconicThumbnailRequest(false), withinIconicLivePreviewRequest(false) + QObject(nullptr), pTbList(createTaskbarList()) { buttonList.reserve(windowsLimitedThumbbarSize); QCoreApplication::instance()->installNativeEventFilter(this); @@ -462,7 +461,7 @@ inline bool QWinThumbnailToolBarPrivate::hasHandle() const inline HWND QWinThumbnailToolBarPrivate::handle() const { - return hasHandle() ? reinterpret_cast<HWND>(window->winId()) : HWND(0); + return hasHandle() ? reinterpret_cast<HWND>(window->winId()) : nullptr; } void QWinThumbnailToolBarPrivate::initToolbar() @@ -504,7 +503,7 @@ void QWinThumbnailToolBarPrivate::_q_updateToolbar() if (!button->icon().isNull()) {; buttons[i].hIcon = QtWin::toHICON(button->icon().pixmap(GetSystemMetrics(SM_CXSMICON))); if (!buttons[i].hIcon) - buttons[i].hIcon = static_cast<HICON>(LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED)); + buttons[i].hIcon = static_cast<HICON>(LoadImage(nullptr, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED)); else createdIcons << buttons[i].hIcon; } @@ -543,7 +542,11 @@ bool QWinThumbnailToolBarPrivate::eventFilter(QObject *object, QEvent *event) return QObject::eventFilter(object, event); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QWinThumbnailToolBarPrivate::nativeEventFilter(const QByteArray &, void *message, qintptr *result) +#else bool QWinThumbnailToolBarPrivate::nativeEventFilter(const QByteArray &, void *message, long *result) +#endif { const MSG *msg = static_cast<const MSG *>(message); if (handle() != msg->hwnd) diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h index 38d210b..c3180f3 100644 --- a/src/winextras/qwinthumbnailtoolbar_p.h +++ b/src/winextras/qwinthumbnailtoolbar_p.h @@ -69,7 +69,7 @@ public: class IconicPixmapCache { public: - IconicPixmapCache() : m_bitmap(0) {} + IconicPixmapCache() = default; ~IconicPixmapCache() { deleteBitmap(); } operator bool() const { return !m_pixmap.isNull(); } @@ -84,7 +84,7 @@ public: QPixmap m_pixmap; QSize m_size; - HBITMAP m_bitmap; + HBITMAP m_bitmap = nullptr; }; QWinThumbnailToolBarPrivate(); @@ -95,16 +95,20 @@ public: void _q_scheduleUpdate(); bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; +#endif static void initButtons(THUMBBUTTON *buttons); static int makeNativeButtonFlags(const QWinThumbnailToolButton *button); static int makeButtonMask(const QWinThumbnailToolButton *button); static QString msgComFailed(const char *function, HRESULT hresult); - bool updateScheduled; + bool updateScheduled = false; QList<QWinThumbnailToolButton *> buttonList; - QWindow *window; + QWindow *window = nullptr; ITaskbarList4 * const pTbList; IconicPixmapCache iconicThumbnail; @@ -117,10 +121,10 @@ private: void updateIconicThumbnail(const MSG *message); void updateIconicLivePreview(const MSG *message); - QWinThumbnailToolBar *q_ptr; + QWinThumbnailToolBar *q_ptr = nullptr; Q_DECLARE_PUBLIC(QWinThumbnailToolBar) - bool withinIconicThumbnailRequest; - bool withinIconicLivePreviewRequest; + bool withinIconicThumbnailRequest = false; + bool withinIconicLivePreviewRequest = false; }; QT_END_NAMESPACE diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro index 705c48c..8f582a5 100644 --- a/src/winextras/winextras.pro +++ b/src/winextras/winextras.pro @@ -2,8 +2,6 @@ TARGET = QtWinExtras QT += gui-private core-private -DEFINES += QT_NO_FOREACH - SOURCES += \ qwinfunctions.cpp \ qwintaskbarbutton.cpp \ |