1 files changed, 12 insertions, 8 deletions
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