Index: src/ch/StatusDlg.h
===================================================================
diff -u -rd04caed42cbc16ffd508f173ca5f92d9512cfc69 -r0d5b67ee96b435d63f7bf075dc8e28603793b187
--- src/ch/StatusDlg.h	(.../StatusDlg.h)	(revision d04caed42cbc16ffd508f173ca5f92d9512cfc69)
+++ src/ch/StatusDlg.h	(.../StatusDlg.h)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
@@ -22,12 +22,11 @@
 #include "FFListCtrl.h"
 #include "TProgressCtrlEx.h"
 #include "TExplorerTaskBarProgress.h"
+#include "../libchengine/TTask.h"
+#include "../libchengine/TTaskManager.h"
 
-namespace chcore
-{
+namespace chengine {
 	class TTaskManager;
-	class TTask;
-	typedef std::shared_ptr<TTask> TTaskPtr;
 }
 
 #define WM_UPDATESTATUS WM_USER+6
@@ -39,48 +38,48 @@
 {
 // Construction
 public:
-	CStatusDlg(chcore::TTaskManager* pTasks, CWnd* pParent = nullptr);   // standard constructor
+	explicit CStatusDlg(chengine::TTaskManager* pTasks, CWnd* pParent = nullptr);   // standard constructor
 	virtual ~CStatusDlg();
 
 	void PostCloseMessage();
 	void SetBufferSizesString(unsigned long long ullValue, int iIndex);
 	void RefreshStatus();
 
-	int GetImageFromStatus(chcore::ETaskCurrentState eState);
+	int GetImageFromStatus(chengine::ETaskCurrentState eState);
 
 	void ApplyButtonsState();
-	chcore::TTaskPtr GetSelectedItemPointer();
+	chengine::TTaskPtr GetSelectedItemPointer();
 	size_t GetSelectedItemSessionUniqueID();
 
 	void EnableControls(bool bEnable=true);
 
 protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
 
-	virtual void OnLanguageChanged();
+	void OnLanguageChanged() override;
 
 	void PrepareResizableControls();
-	CString GetStatusString(const chcore::TTaskStatsSnapshotPtr& spTaskStats);
+	CString GetStatusString(const chengine::TTaskStatsSnapshotPtr& spTaskStats);
 
 	void StickDialogToScreenEdge();
 
 	CString FormatTime(unsigned long long timeSeconds);
 	CString FormatTimeMiliseconds(unsigned long long timeMiliSeconds);
 
 	CString GetProcessedText(unsigned long long ullProcessedCount, unsigned long long ullTotalCount, unsigned long long ullProcessedSize, unsigned long long ullTotalSize);
-	void UpdateTaskStatsDetails(const chcore::TTaskStatsSnapshotPtr& spTaskStats);
-	void SetTaskListEntry(size_t stPos, const chcore::TTaskStatsSnapshotPtr& spTaskStats);
-	CString GetSubtaskName(chcore::ESubOperationType eSubtask) const;
+	void UpdateTaskStatsDetails(const chengine::TTaskStatsSnapshotPtr& spTaskStats);
+	void SetTaskListEntry(size_t stPos, const chengine::TTaskStatsSnapshotPtr& spTaskStats);
+	CString GetSubtaskName(chengine::ESubOperationType eSubtask) const;
 
 	CString GetProgressWindowTitleText() const;
 	void UpdateTaskBarProgress() const;
 
 	CString GetSpeedString(double dSizeSpeed, double dAvgSizeSpeed, double dCountSpeed, double dAvgCountSpeed) const;
 	void SetWindowTitle(PCTSTR pszText);
 
-	virtual BOOL OnInitDialog();
+	BOOL OnInitDialog() override;
 
 	void SelectInitialTask();
 
@@ -99,20 +98,20 @@
 	afx_msg void OnRemoveFinishedButton();
 	afx_msg void OnKeydownStatusList(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnSelectionChanged(NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/);
-	virtual void OnCancel();
+	void OnCancel() override;
 	afx_msg void OnShowLogButton();
 	afx_msg void OnStickButton();
 	afx_msg void OnResumeButton();
 
 	DECLARE_MESSAGE_MAP()
 
 public:
-	chcore::TTaskPtr m_spInitialSelection;
+	chengine::TTaskPtr m_spInitialSelection;
 
 	static bool m_bLock;				// locker
 
 protected:
-	chcore::TTaskManager* m_pTasks;
+	chengine::TTaskManager* m_pTasks;
 
 	CImageList m_images;
 	CFFListCtrl m_ctlStatusList;
@@ -124,7 +123,7 @@
 	TProgressCtrlEx m_ctlSubTaskSizeProgress;
 	TProgressCtrlEx	m_ctlProgressAll;
 
-	chcore::TTaskManagerStatsSnapshotPtr m_spTaskMgrStats;
+	chengine::TTaskManagerStatsSnapshotPtr m_spTaskMgrStats;
 	TExplorerTaskBarProgress m_taskBarProgress;
 };