diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | examples/winextras/musicplayer/main.cpp | 6 | ||||
-rw-r--r-- | src/winextras/qwinjumplist.cpp | 5 | ||||
-rw-r--r-- | src/winextras/qwinjumplist_p.h | 14 | ||||
-rw-r--r-- | src/winextras/qwinjumplistcategory.cpp | 5 | ||||
-rw-r--r-- | src/winextras/qwinjumplistcategory_p.h | 8 | ||||
-rw-r--r-- | src/winextras/qwinjumplistitem_p.h | 4 | ||||
-rw-r--r-- | src/winextras/qwintaskbarprogress.cpp | 19 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbutton_p.h | 13 |
9 files changed, 28 insertions, 48 deletions
diff --git a/.qmake.conf b/.qmake.conf index fec66b7..b1c22d3 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.8.1 +MODULE_VERSION = 5.9.0 diff --git a/examples/winextras/musicplayer/main.cpp b/examples/winextras/musicplayer/main.cpp index b5c4141..1386da5 100644 --- a/examples/winextras/musicplayer/main.cpp +++ b/examples/winextras/musicplayer/main.cpp @@ -68,8 +68,10 @@ static bool associateFileTypes() settings.beginGroup(QStringLiteral("SupportedTypes")); QMimeDatabase mimeDatabase; - foreach (const QString &fileType, MusicPlayer::supportedMimeTypes()) { - foreach (QString suffix, mimeDatabase.mimeTypeForName(fileType).suffixes()) { + const QStringList supportedMimeTypes = MusicPlayer::supportedMimeTypes(); + for (const QString &fileType : supportedMimeTypes) { + const QStringList suffixes = mimeDatabase.mimeTypeForName(fileType).suffixes(); + for (QString suffix : suffixes) { suffix.prepend('.'); settings.setValue(suffix, QString()); } diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp index 9274cc5..a277a74 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -111,11 +111,6 @@ static QString createArguments(const QStringList &arguments) return args; } -QWinJumpListPrivate::QWinJumpListPrivate() : - pDestList(0), recent(0), frequent(0), tasks(0), dirty(false) -{ -} - void QWinJumpListPrivate::warning(const char *function, HRESULT hresult) { const QString err = QtWin::errorStringFromHresult(hresult); diff --git a/src/winextras/qwinjumplist_p.h b/src/winextras/qwinjumplist_p.h index e150fac..ff54f96 100644 --- a/src/winextras/qwinjumplist_p.h +++ b/src/winextras/qwinjumplist_p.h @@ -62,8 +62,6 @@ class QWinJumpListPrivate Q_DECLARE_PUBLIC(QWinJumpList) public: - QWinJumpListPrivate(); - static QWinJumpListPrivate *get(QWinJumpList *list) { return list->d_func(); @@ -92,14 +90,14 @@ public: static IShellItem2 *toIShellItem(const QWinJumpListItem *item); static IShellLinkW *makeSeparatorShellItem(); - QWinJumpList *q_ptr; - ICustomDestinationList *pDestList; - QWinJumpListCategory *recent; - QWinJumpListCategory *frequent; - QWinJumpListCategory *tasks; + QWinJumpList *q_ptr = nullptr; + ICustomDestinationList *pDestList = nullptr; + QWinJumpListCategory *recent = nullptr; + QWinJumpListCategory *frequent = nullptr; + QWinJumpListCategory *tasks = nullptr; QList<QWinJumpListCategory *> categories; QString identifier; - bool dirty; + bool dirty = false; }; QT_END_NAMESPACE diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp index 5f53667..4410c9c 100644 --- a/src/winextras/qwinjumplistcategory.cpp +++ b/src/winextras/qwinjumplistcategory.cpp @@ -85,11 +85,6 @@ QT_BEGIN_NAMESPACE A jump list category of tasks. */ -QWinJumpListCategoryPrivate::QWinJumpListCategoryPrivate() : - visible(false), jumpList(0), type(QWinJumpListCategory::Custom) -{ -} - QWinJumpListCategory *QWinJumpListCategoryPrivate::create(QWinJumpListCategory::Type type, QWinJumpList *jumpList) { QWinJumpListCategory *category = new QWinJumpListCategory; diff --git a/src/winextras/qwinjumplistcategory_p.h b/src/winextras/qwinjumplistcategory_p.h index b523c73..eee17b4 100644 --- a/src/winextras/qwinjumplistcategory_p.h +++ b/src/winextras/qwinjumplistcategory_p.h @@ -61,8 +61,6 @@ class QWinJumpList; class QWinJumpListCategoryPrivate { public: - QWinJumpListCategoryPrivate(); - static QWinJumpListCategoryPrivate *get(QWinJumpListCategory *category) { return category->d_func(); @@ -75,10 +73,10 @@ public: void addRecent(QWinJumpListItem *item); void clearRecents(); - bool visible; + bool visible = false; QString title; - QWinJumpList *jumpList; - QWinJumpListCategory::Type type; + QWinJumpList *jumpList = nullptr; + QWinJumpListCategory::Type type = QWinJumpListCategory::Custom; QList<QWinJumpListItem *> items; }; diff --git a/src/winextras/qwinjumplistitem_p.h b/src/winextras/qwinjumplistitem_p.h index e59bff9..3857ea7 100644 --- a/src/winextras/qwinjumplistitem_p.h +++ b/src/winextras/qwinjumplistitem_p.h @@ -74,8 +74,8 @@ public: QString description; QIcon icon; QStringList arguments; - QWinJumpListItem::Type type; - QWinJumpListCategory *category; + QWinJumpListItem::Type type = QWinJumpListItem::Destination; + QWinJumpListCategory *category = nullptr; }; QT_END_NAMESPACE diff --git a/src/winextras/qwintaskbarprogress.cpp b/src/winextras/qwintaskbarprogress.cpp index 74323d6..de77a40 100644 --- a/src/winextras/qwintaskbarprogress.cpp +++ b/src/winextras/qwintaskbarprogress.cpp @@ -94,21 +94,14 @@ QT_BEGIN_NAMESPACE class QWinTaskbarProgressPrivate { public: - QWinTaskbarProgressPrivate(); - - int value; - int minimum; - int maximum; - bool visible; - bool paused; - bool stopped; + int value = 0; + int minimum = 0; + int maximum = 100; + bool visible = false; + bool paused = false; + bool stopped = false; }; -QWinTaskbarProgressPrivate::QWinTaskbarProgressPrivate() : - value(0), minimum(0), maximum(100), visible(false), paused(false), stopped(false) -{ -} - /*! Constructs a QWinTaskbarProgress with the parent object \a parent. */ diff --git a/src/winextras/qwinthumbnailtoolbutton_p.h b/src/winextras/qwinthumbnailtoolbutton_p.h index cc212b3..9ff02d6 100644 --- a/src/winextras/qwinthumbnailtoolbutton_p.h +++ b/src/winextras/qwinthumbnailtoolbutton_p.h @@ -61,16 +61,15 @@ class QWinThumbnailToolBar; class QWinThumbnailToolButtonPrivate { public: - QWinThumbnailToolButtonPrivate() : enabled(true), interactive(true), dismiss(false), visible(true), flat(false), toolbar(Q_NULLPTR) {} QString toolTip; QIcon icon; - bool enabled; - bool interactive; - bool dismiss; - bool visible; - bool flat; + bool enabled = true; + bool interactive = true; + bool dismiss = false; + bool visible = true; + bool flat = false; - QWinThumbnailToolBar *toolbar; + QWinThumbnailToolBar *toolbar = nullptr; }; QT_END_NAMESPACE |