Index: src/ch/MiniViewDlg.cpp =================================================================== diff -u -N -r0cf74c78280b58c363868caafb9bf493a57aa006 -r1d8d51e0dd4d8ebcf0bd457d01fab984585220c0 --- src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 0cf74c78280b58c363868caafb9bf493a57aa006) +++ src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 1d8d51e0dd4d8ebcf0bd457d01fab984585220c0) @@ -17,7 +17,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "stdafx.h" -#include "../libchcore/task.h" +#include "../libchcore/TTaskManager.h" +#include "../libchcore/TTask.h" #include "MiniViewDlg.h" #include "ch.h" #include @@ -42,7 +43,7 @@ ///////////////////////////////////////////////////////////////////////////// // CMiniViewDlg dialog -CMiniViewDlg::CMiniViewDlg(chcore::CTaskArray* pArray, bool *pbHide, CWnd* pParent /*=NULL*/) +CMiniViewDlg::CMiniViewDlg(chcore::TTaskManager* pArray, bool *pbHide, CWnd* pParent /*=NULL*/) :ictranslate::CLanguageDialog(IDD_MINIVIEW_DIALOG, pParent, &m_bLock) { //{{AFX_DATA_INIT(CMiniViewDlg) @@ -184,7 +185,7 @@ { for(size_t stIndex = 0; stIndex < m_pTasks->GetSize(); ++stIndex) { - chcore::CTaskPtr spTask = m_pTasks->GetAt(stIndex); + chcore::TTaskPtr spTask = m_pTasks->GetAt(stIndex); spTask->GetMiniSnapshot(&m_tMiniDisplayData); if(m_tMiniDisplayData.m_eTaskState != chcore::eTaskState_Finished && m_tMiniDisplayData.m_eTaskState != chcore::eTaskState_Cancelled) @@ -410,7 +411,7 @@ if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size()) return; - chcore::CTaskPtr spTask = pDlg->m_ctlStatus.m_vItems.at(iSel)->m_spTask; + chcore::TTaskPtr spTask = pDlg->m_ctlStatus.m_vItems.at(iSel)->m_spTask; if(spTask) spTask->PauseProcessing(); else @@ -517,7 +518,7 @@ int iSel=pDlg->m_ctlStatus.GetCurSel(); if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size()) return; - chcore::CTaskPtr spTask = pDlg->m_ctlStatus.m_vItems.at(iSel)->m_spTask; + chcore::TTaskPtr spTask = pDlg->m_ctlStatus.m_vItems.at(iSel)->m_spTask; if (spTask) { if(spTask->GetTaskState() == chcore::eTaskState_Waiting) @@ -561,7 +562,7 @@ int iSel=pDlg->m_ctlStatus.GetCurSel(); if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size()) return; - chcore::CTaskPtr spTask = pDlg->m_ctlStatus.m_vItems.at(iSel)->m_spTask; + chcore::TTaskPtr spTask = pDlg->m_ctlStatus.m_vItems.at(iSel)->m_spTask; if(spTask) spTask->CancelProcessing(); else @@ -615,7 +616,7 @@ int iSel=pDlg->m_ctlStatus.GetCurSel(); if (iSel == LB_ERR || (size_t)iSel >= pDlg->m_ctlStatus.m_vItems.size()) return; - chcore::CTaskPtr spTask = pDlg->m_ctlStatus.m_vItems.at(iSel)->m_spTask; + chcore::TTaskPtr spTask = pDlg->m_ctlStatus.m_vItems.at(iSel)->m_spTask; if(spTask) spTask->RestartProcessing(); else @@ -809,7 +810,7 @@ if(iSel == LB_ERR || (size_t)iSel >= m_ctlStatus.m_vItems.size()) return; - chcore::CTaskPtr spTask = m_ctlStatus.m_vItems.at(iSel)->m_spTask; + chcore::TTaskPtr spTask = m_ctlStatus.m_vItems.at(iSel)->m_spTask; if(spTask) GetParent()->PostMessage(WM_MINIVIEWDBLCLK, 0, (LPARAM)spTask->GetSessionUniqueID()); else