Index: src/ch/MainWnd.cpp =================================================================== diff -u -N -rbeeac49d2e0888993bd231a4e5863c7f0741e154 -r5057e08b0cc064972abeb94a488e5f12d9db14a0 --- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision beeac49d2e0888993bd231a4e5863c7f0741e154) +++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 5057e08b0cc064972abeb94a488e5f12d9db14a0) @@ -35,6 +35,8 @@ #include "StatusDlg.h" #include "ClipboardMonitor.h" +#include + #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE @@ -389,9 +391,9 @@ KillTimer(3245); if (GetConfig().get_bool(PP_STATUSAUTOREMOVEFINISHED)) { - int iSize=m_tasks.GetSize(); + size_t stSize = m_tasks.GetSize(); m_tasks.RemoveAllFinished(); - if (m_tasks.GetSize() != iSize && m_pdlgStatus && m_pdlgStatus->m_bLock && IsWindow(m_pdlgStatus->m_hWnd)) + if(m_tasks.GetSize() != stSize && m_pdlgStatus && m_pdlgStatus->m_bLock && IsWindow(m_pdlgStatus->m_hWnd)) m_pdlgStatus->SendMessage(WM_UPDATESTATUS); } @@ -541,15 +543,15 @@ // create new task CTask *pTask = m_tasks.CreateTask(); pTask->SetDestPath(strDstPath); - CClipboardEntry* pEntry; + CClipboardEntryPtr spEntry; // files for (int i=0;iSetPath(astrFiles.GetAt(i)); - pEntry->CalcBufferIndex(pTask->GetDestPath()); - pTask->AddClipboardData(pEntry); + spEntry.reset(new CClipboardEntry); + spEntry->SetPath(astrFiles.GetAt(i)); + spEntry->CalcBufferIndex(pTask->GetDestPath()); + pTask->AddClipboardData(spEntry); } pTask->SetStatus(bMove ? ST_MOVE : ST_COPY, ST_OPERATION_MASK); @@ -626,13 +628,13 @@ // new task CTask *pTask = m_tasks.CreateTask(); pTask->SetDestPath(dlg.m_ccData.m_strDestPath); - CClipboardEntry *pEntry; + CClipboardEntryPtr spEntry; for (int i=0;iSetPath(dlg.m_ccData.m_astrPaths.GetAt(i)); - pEntry->CalcBufferIndex(pTask->GetDestPath()); - pTask->AddClipboardData(pEntry); + spEntry.reset(new CClipboardEntry); + spEntry->SetPath(dlg.m_ccData.m_astrPaths.GetAt(i)); + spEntry->CalcBufferIndex(pTask->GetDestPath()); + pTask->AddClipboardData(spEntry); } pTask->SetStatus((dlg.m_ccData.m_iOperation == 1) ? ST_MOVE : ST_COPY, ST_OPERATION_MASK); @@ -764,7 +766,7 @@ } // count of shortcuts to store - g_pscsShared->iShortcutsCount=__min(cvShortcuts.size(), (SHARED_BUFFERSIZE - 5 * sizeof(_COMMAND)) / sizeof(_SHORTCUT)); + g_pscsShared->iShortcutsCount = (int)__min(cvShortcuts.size(), (SHARED_BUFFERSIZE - 5 * sizeof(_COMMAND)) / sizeof(_SHORTCUT)); _SHORTCUT* pShortcut = g_pscsShared->GetShortcutsPtr(); CShortcut sc; for (int i=0;iiShortcutsCount;i++) @@ -939,9 +941,11 @@ m_tasks.SaveProgress(); // delete all tasks - int iSize=m_tasks.GetSize(); - for (int i=0;i* >(&m_tasks))->RemoveAll(); }