Refactor QWinTaskbarProgress out of QWinTaskbarButton

Change-Id: I8b95d7804d9070c8e93993ad6acf5c22d964880d
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 7 insertions, 14 deletions

diff --git a/src/winextras/qwintaskbarbutton_p.h b/src/winextras/qwintaskbarbutton_p.h
index 51dc657..dbb88ea 100644
--- a/src/winextras/qwintaskbarbutton_p.h
+++ b/src/winextras/qwintaskbarbutton_p.h
@@ -43,44 +43,37 @@
 #define QWINTASKBARBUTTON_P_H
 
 #include "qwintaskbarbutton.h"
-#include "winshobjidl_p.h"
 
 #include <QWindow>
-#include <QAbstractNativeEventFilter>
+#include <QPointer>
 #include <qt_windows.h>
 
 struct ITaskbarList4;
 
 QT_BEGIN_NAMESPACE
 
+class QWinTaskbarProgress;
+
 class QWinTaskbarButtonPrivate
 {
 public:
     QWinTaskbarButtonPrivate();
     ~QWinTaskbarButtonPrivate();
 
-    int progressMinimum;
-    int progressMaximum;
-    int progressValue;
+    QPointer<QWinTaskbarProgress> progressBar;
     QIcon overlayIcon;
     QString overlayIconDescription;
-    QWinTaskbarButton::ProgressState progressState;
-    bool updateNeeded;
 
     HWND handle();
     int iconSize() const;
-    static TBPFLAG nativeProgressState(QWinTaskbarButton::ProgressState);
 
     void updateOverlayIcon();
-    void updateProgressValue();
+
+    void _q_updateProgressValue();
+    void _q_updateProgressState();
 
     ITaskbarList4 *pTbList;
     QWindow *window;
-
-private:
-    QWinTaskbarButton *q_ptr;
-
-    Q_DECLARE_PUBLIC(QWinTaskbarButton)
 };
 
 QT_END_NAMESPACE