diff options
Diffstat (limited to 'src/imports')
19 files changed, 57 insertions, 83 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 \ |