Introduce nullptr

Apply Fixits by Qt Creator.
Introduce more member initialization.

Change-Id: I81c6860188f0e1592c4df2435ff7f91500456741
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
 

21 files changed, 87 insertions, 90 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 fc3231d..313f27e 100644
--- a/src/imports/winextras/qquickdwmfeatures.cpp
+++ b/src/imports/winextras/qquickdwmfeatures.cpp
@@ -342,9 +342,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/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp
index fada87f..96b1074 100644
--- a/src/imports/winextras/qquickjumplist.cpp
+++ b/src/imports/winextras/qquickjumplist.cpp
@@ -139,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);
 }
 
 /*!
diff --git a/src/imports/winextras/qquickjumplist_p.h b/src/imports/winextras/qquickjumplist_p.h
index e36e26a..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;
diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp
index d395ea8..673d96b 100644
--- a/src/imports/winextras/qquickjumplistcategory.cpp
+++ b/src/imports/winextras/qquickjumplistcategory.cpp
@@ -73,7 +73,7 @@ QQuickJumpListCategory::~QQuickJumpListCategory() = default;
  */
 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);
 }
 
 /*!
diff --git a/src/imports/winextras/qquickjumplistcategory_p.h b/src/imports/winextras/qquickjumplistcategory_p.h
index 5b76292..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;
diff --git a/src/imports/winextras/qquickjumplistitem_p.h b/src/imports/winextras/qquickjumplistitem_p.h
index a202c41..ca47a35 100644
--- a/src/imports/winextras/qquickjumplistitem_p.h
+++ b/src/imports/winextras/qquickjumplistitem_p.h
@@ -70,7 +70,7 @@ public:
         ItemTypeSeparator = 3
     };
 
-    explicit QQuickJumpListItem(QObject *p = 0);
+    explicit QQuickJumpListItem(QObject *p = nullptr);
     ~QQuickJumpListItem();
 
     int type() const;
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 6e0beb8..91ab5bd 100644
--- a/src/imports/winextras/qquickthumbnailtoolbar.cpp
+++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp
@@ -83,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)
diff --git a/src/imports/winextras/qquickthumbnailtoolbar_p.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h
index 6e05bff..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;
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/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp
index e9596d9..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,7 +60,7 @@ QWinEventFilter::QWinEventFilter() :
 
 QWinEventFilter::~QWinEventFilter()
 {
-    instance = 0;
+    instance = nullptr;
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -72,8 +72,8 @@ bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long
     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/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
index 82fd25b..e891ad6 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -209,9 +209,9 @@ HRGN QtWin::toHRGN(const QRegion &region)
 {
     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,7 +231,7 @@ HRGN QtWin::toHRGN(const QRegion &region)
  */
 QRegion QtWin::fromHRGN(HRGN hrgn)
 {
-    DWORD regionDataSize = GetRegionData(hrgn, 0, NULL);
+    DWORD regionDataSize = GetRegionData(hrgn, 0, nullptr);
     if (regionDataSize == 0)
         return QRegion();
 
@@ -1738,10 +1738,10 @@ void QtWin::enableBlurBehindWindow(QWindow *window, const QRegion &region)
 {
     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/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index ca1b20a..92b3ccc 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);
@@ -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());
@@ -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();
 }
diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp
index 721a78c..47daacf 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()) {
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..6f72ef5 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);
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 5afccda..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,7 +435,7 @@ 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;
 }
@@ -461,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()
@@ -503,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;
         }