Index: src/ch/MainWnd.cpp =================================================================== diff -u -r71c49ab6ac2e657dee997cb9129c7d0d4dde21b6 -r1366914bd5d2f7fa72cad0c7012184e1a452a89c --- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 71c49ab6ac2e657dee997cb9129c7d0d4dde21b6) +++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 1366914bd5d2f7fa72cad0c7012184e1a452a89c) @@ -338,12 +338,11 @@ } case WM_MOUSEMOVE: { - TCHAR text[ _MAX_PATH ]; - if (m_spTasks->GetSize() != 0) { m_spTasks->GetStatsSnapshot(m_spTaskMgrStats); + TCHAR text[ _MAX_PATH ]; _sntprintf(text, _MAX_PATH, _T("%s - %.0f %%"), GetApp().GetAppName(), m_spTaskMgrStats->GetCombinedProgress() * 100.0); m_ctlTray.SetTooltipText(text); } Index: src/libchcore/TSubTaskCopyMove.cpp =================================================================== diff -u -r12b36349f6214befeace08efa9acc7e03be0d847 -r1366914bd5d2f7fa72cad0c7012184e1a452a89c --- src/libchcore/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision 12b36349f6214befeace08efa9acc7e03be0d847) +++ src/libchcore/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision 1366914bd5d2f7fa72cad0c7012184e1a452a89c) @@ -338,9 +338,6 @@ TFilesystemFileFeedbackWrapper tFileFBWrapper(spFeedbackHandler, GetContext().GetLogFileData(), rThreadController, spFilesystem); - TString strFormat; - TSubTaskBase::ESubOperationResult eResult = TSubTaskBase::eSubResult_Continue; - // calculate if we want to disable buffering for file transfer // NOTE: we are using here the file size read when scanning directories for files; it might be // outdated at this point, but at present we don't want to re-read file size since it @@ -352,7 +349,7 @@ IFilesystemFilePtr fileDst = spFilesystem->CreateFileObject(pData->pathDstFile, bNoBuffer); bool bSkip = false; - eResult = OpenSrcAndDstFilesFB(tFileFBWrapper, pData, fileSrc, fileDst, bSkip); + TSubTaskBase::ESubOperationResult eResult = OpenSrcAndDstFilesFB(tFileFBWrapper, pData, fileSrc, fileDst, bSkip); if(eResult != TSubTaskBase::eSubResult_Continue) return eResult; else if(bSkip) @@ -403,6 +400,7 @@ case WAIT_OBJECT_0 + eKillThread: { // log + TString strFormat; strFormat = _T("Kill request while main copying file %srcpath -> %dstpath"); strFormat.Replace(_T("%srcpath"), pData->spSrcFile->GetFullFilePath().ToString()); strFormat.Replace(_T("%dstpath"), pData->pathDstFile.ToString()); Index: src/libchcore/TSubTaskDelete.cpp =================================================================== diff -u -r12b36349f6214befeace08efa9acc7e03be0d847 -r1366914bd5d2f7fa72cad0c7012184e1a452a89c --- src/libchcore/TSubTaskDelete.cpp (.../TSubTaskDelete.cpp) (revision 12b36349f6214befeace08efa9acc7e03be0d847) +++ src/libchcore/TSubTaskDelete.cpp (.../TSubTaskDelete.cpp) (revision 1366914bd5d2f7fa72cad0c7012184e1a452a89c) @@ -130,13 +130,12 @@ continue; } - ESubOperationResult eResult = TSubTaskBase::eSubResult_Continue; // delete data bool bProtectReadOnlyFiles = GetTaskPropValue(GetContext().GetConfig()); if (spFileInfo->IsDirectory()) - eResult = tFilesystemFBWrapper.RemoveDirectoryFB(spFileInfo, bProtectReadOnlyFiles); + tFilesystemFBWrapper.RemoveDirectoryFB(spFileInfo, bProtectReadOnlyFiles); else - eResult = tFilesystemFBWrapper.DeleteFileFB(spFileInfo, bProtectReadOnlyFiles); + tFilesystemFBWrapper.DeleteFileFB(spFileInfo, bProtectReadOnlyFiles); ++fcIndex; } Index: src/libchcore/TTask.cpp =================================================================== diff -u -r7de00e54431d78b6c54fad6fb163dbc306381ef5 -r1366914bd5d2f7fa72cad0c7012184e1a452a89c --- src/libchcore/TTask.cpp (.../TTask.cpp) (revision 7de00e54431d78b6c54fad6fb163dbc306381ef5) +++ src/libchcore/TTask.cpp (.../TTask.cpp) (revision 1366914bd5d2f7fa72cad0c7012184e1a452a89c) @@ -567,8 +567,6 @@ std::unique_ptr upExceptionInfoBuffer(new wchar_t[ExceptionBufferSize]); try { - TSubTaskBase::ESubOperationResult eResult = TSubTaskBase::eSubResult_Continue; - // start operation OnBeginOperation(); @@ -587,7 +585,7 @@ m_tSubTasksArray.InitBeforeExec(); // exec the estimation subtasks - eResult = m_tSubTasksArray.Execute(spFeedbackHandler, true); + TSubTaskBase::ESubOperationResult eResult = m_tSubTasksArray.Execute(spFeedbackHandler, true); // go into wait state only in case the preprocessing did not finish the operation already // (only fast move can do that right now) Index: src/libictranslate/cfg.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r1366914bd5d2f7fa72cad0c7012184e1a452a89c --- src/libictranslate/cfg.h (.../cfg.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/libictranslate/cfg.h (.../cfg.h) (revision 1366914bd5d2f7fa72cad0c7012184e1a452a89c) @@ -83,8 +83,11 @@ /** \name Construction/destruction */ /**@{*/ explicit config(config_base_types eCfgType); ///< Standard constructor + config(const config& rSrc) = delete; virtual ~config(); ///< Standard destructor -/**@}*/ + + config& operator=(const config& rSrc) = delete; + /**@}*/ /** \name Reading and writing to the external medium */ /**@{*/