Index: src/ch/MiniViewDlg.h
===================================================================
diff -u -r22573f5fa8bfbf68a19deb7631962e026f028045 -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/ch/MiniViewDlg.h	(.../MiniViewDlg.h)	(revision 22573f5fa8bfbf68a19deb7631962e026f028045)
+++ src/ch/MiniViewDlg.h	(.../MiniViewDlg.h)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -21,9 +21,13 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CMiniViewDlg dialog
-#include "task.h"
 #include "ProgressListBox.h"
 
+namespace chcore
+{
+	class TTaskManager;
+}
+
 #define BTN_COUNT 5
 
 #define MSG_DRAWBUTTON	1
@@ -47,15 +51,15 @@
 
 // Construction
 public:
-	CMiniViewDlg(CTaskArray* pArray, bool* pbHide, CWnd* pParent = NULL);   // standard constructor
+	CMiniViewDlg(chcore::TTaskManager* pArray, bool* pbHide, CWnd* pParent = nullptr);   // standard constructor
 
 	void ShowWindow();
 	void HideWindow();
 	void ResizeDialog();
-	friend void OnRestartBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC=NULL);
-	friend void OnCancelBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC=NULL);
-	friend void OnResume(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC=NULL);
-	friend void OnPause(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC=NULL);
+	friend void OnRestartBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC=nullptr);
+	friend void OnCancelBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC=nullptr);
+	friend void OnResume(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC=nullptr);
+	friend void OnPause(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC=nullptr);
 	friend void OnCloseBtn(CMiniViewDlg* pDlg, UINT uiMsg, CMiniViewDlg::_BTNDATA_* pData, CDC* pDC);
 
 	void RefreshStatus();
@@ -64,40 +68,10 @@
 	virtual UINT GetLanguageUpdateOptions() { return LDF_NODIALOGSIZE; };
 	virtual void OnLanguageChanged();
 
-	// from CMainWnd
-	CTaskArray *m_pTasks;
-
-	CBrush m_brBackground;
-	int m_iLastHeight;
-	bool m_bShown;
-	_PROGRESSITEM_ item;
-
-	// cache
-	TASK_MINI_DISPLAY_DATA m_tMiniDisplayData;
-	bool m_bActive;
-
-	// lock
-	static bool m_bLock;
-	bool *m_pbHide;		// does the big status dialog visible ?
-
-	// in onmousemove points to last pressed button
-	int m_iIndex;
-
-	CProgressListBox	m_ctlStatus;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CMiniViewDlg)
-	public:
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
-	//}}AFX_VIRTUAL
 
-// Implementation
-protected:
-	// Generated message map functions
-	//{{AFX_MSG(CMiniViewDlg)
 	afx_msg HBRUSH OnCtlColor(CDC*, CWnd*, UINT);
 	virtual BOOL OnInitDialog();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
@@ -111,11 +85,31 @@
 	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
 	afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection);
 	afx_msg void OnDblclkProgressList();
-	//}}AFX_MSG
+
 	DECLARE_MESSAGE_MAP()
-};
 
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+public:
+	static bool m_bLock;
 
+private:
+	// from CMainWnd
+	chcore::TTaskManager *m_pTasks;
+
+	CBrush m_brBackground;
+	int m_iLastHeight;
+	bool m_bShown;
+	_PROGRESSITEM_ item;
+
+	// cache
+	bool m_bActive;
+
+	// lock
+	bool *m_pbHide;		// is the big status dialog visible ?
+
+	// in onmousemove points to last pressed button
+	int m_iIndex;
+
+	CProgressListBox	m_ctlStatus;
+};
+
 #endif