Index: src/ch/DstFileErrorDlg.h =================================================================== diff -u -N --- src/ch/DstFileErrorDlg.h (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/DstFileErrorDlg.h (revision 0) @@ -1,69 +0,0 @@ -/*************************************************************************** -* Copyright (C) 2001-2008 by J�zef Starosczyk * -* ixen@copyhandler.com * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU Library General Public License * -* (version 2) as published by the Free Software Foundation; * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU Library General Public * -* License along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ -#ifndef __DSTFILEERRORDLG_H__ -#define __DSTFILEERRORDLG_H__ - -///////////////////////////////////////////////////////////////////////////// -// CDstFileErrorDlg dialog - -class CDstFileErrorDlg : public ictranslate::CLanguageDialog -{ -// Construction -public: - CDstFileErrorDlg(); // standard constructor - - CString m_strTitle; - bool m_bEnableTimer; - int m_iTime; - int m_iDefaultOption; - -// Dialog Data - //{{AFX_DATA(CDstFileErrorDlg) - enum { IDD = IDD_FEEDBACK_DSTFILE_DIALOG }; - CString m_strMessage; - CString m_strFilename; - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CDstFileErrorDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - - // Generated message map functions - //{{AFX_MSG(CDstFileErrorDlg) - afx_msg void OnRetryButton(); - afx_msg void OnIgnoreButton(); - afx_msg void OnWaitButton(); - afx_msg void OnTimer(UINT_PTR nIDEvent); - virtual BOOL OnInitDialog(); - afx_msg void OnIgnoreAllButton(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif Index: src/ch/TSubTaskProgressInfo.cpp =================================================================== diff -u -N --- src/ch/TSubTaskProgressInfo.cpp (revision 8c87d4185fbe5b952c49f72afcfd5f9fca338fb4) +++ src/ch/TSubTaskProgressInfo.cpp (revision 0) @@ -1,254 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2010 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -/// @file TSubTaskProgressInfo.cpp -/// @date 2010/09/19 -/// @brief Contains implementation of class handling progress information for subtasks. -// ============================================================================ -#include "stdafx.h" -#include "TSubTaskProgressInfo.h" -/* - -/////////////////////////////////////////////////////////////////////////// -// TSubTaskProgressInfo -TSubTaskProgressInfo::TSubTaskProgressInfo() : - m_stProcessedCount(0), - m_stTotalCount(0), - m_ullProcessedSize(0), - m_ullTotalSize(0), - m_timeElapsed(0), - m_timeLast(-1) -{ -} - -TSubTaskProgressInfo::~TSubTaskProgressInfo() -{ -} - -void TSubTaskProgressInfo::GetSnapshot(TSubTaskProgressInfo& rDst) const -{ - boost::unique_lock dst_lock(rDst.m_lock); - boost::shared_lock lock(m_lock); - - rDst.m_stProcessedCount = m_stProcessedCount; - rDst.m_stTotalCount = m_stTotalCount; - - rDst.m_ullProcessedSize = m_ullProcessedSize; - rDst.m_ullTotalSize = m_ullTotalSize; - - if(m_timeLast != -1) - rDst.m_timeElapsed = m_timeElapsed + time(NULL) - m_timeLast; // not storing current time to avoid writing to this object - else - rDst.m_timeElapsed = m_timeElapsed; - - rDst.m_timeLast = -1; -} - -void TSubTaskProgressInfo::Clear() -{ - m_stProcessedCount = 0; - m_stTotalCount = 0; - m_ullProcessedSize = 0; - m_ullTotalSize = 0; - m_timeElapsed = 0; - m_timeLast = -1; -} - -// count-based progress -void TSubTaskProgressInfo::IncreaseProcessedCount(size_t stAdd) -{ - boost::unique_lock lock(m_lock); - m_stProcessedCount += stAdd; -} - -void TSubTaskProgressInfo::DecreaseProcessedCount(size_t stSub) -{ - boost::unique_lock lock(m_lock); - m_stProcessedCount -= stSub; -} - -void TSubTaskProgressInfo::SetProcessedCount(size_t stSet) -{ - boost::unique_lock lock(m_lock); - m_stProcessedCount = stSet; -} - -size_t TSubTaskProgressInfo::GetProcessedCount() const -{ - boost::shared_lock lock(m_lock); - return m_stProcessedCount; -} - -size_t TSubTaskProgressInfo::GetUnProcessedCount() const -{ - boost::shared_lock lock(m_lock); - return m_stTotalCount - m_stProcessedCount; -} - -void TSubTaskProgressInfo::IncreaseTotalCount(size_t stAdd) -{ - boost::unique_lock lock(m_lock); - m_stTotalCount += stAdd; -} - -void TSubTaskProgressInfo::DecreaseTotalCount(size_t stSub) -{ - boost::unique_lock lock(m_lock); - m_stTotalCount -= stSub; -} - -void TSubTaskProgressInfo::SetTotalCount(size_t stSet) -{ - boost::unique_lock lock(m_lock); - m_stTotalCount = stSet; -} - -size_t TSubTaskProgressInfo::GetTotalCount() const -{ - boost::shared_lock lock(m_lock); - return m_stTotalCount; -} - -double TSubTaskProgressInfo::GetCountProgressInPercent() const -{ - boost::shared_lock lock(m_lock); - - long double dPercent = 0; - - if(m_stTotalCount != 0) - dPercent = (long double)m_stProcessedCount / (long double)m_stTotalCount; - - return (double)dPercent; -} - -// size-based progress -void TSubTaskProgressInfo::IncreaseProcessedSize(unsigned long long ullAdd) -{ - boost::unique_lock lock(m_lock); - m_ullProcessedSize += ullAdd; -} - -void TSubTaskProgressInfo::DecreaseProcessedSize(unsigned long long ullSub) -{ - boost::unique_lock lock(m_lock); - m_ullProcessedSize -= ullSub; -} - -void TSubTaskProgressInfo::SetProcessedSize(unsigned long long ullSet) -{ - boost::unique_lock lock(m_lock); - m_ullProcessedSize = ullSet; -} - -unsigned long long TSubTaskProgressInfo::GetProcessedSize() const -{ - boost::shared_lock lock(m_lock); - return m_ullProcessedSize; -} - -unsigned long long TSubTaskProgressInfo::GetUnProcessedSize() const -{ - boost::shared_lock lock(m_lock); - return m_ullTotalSize - m_ullProcessedSize; -} - -void TSubTaskProgressInfo::IncreaseTotalSize(unsigned long long ullAdd) -{ - boost::unique_lock lock(m_lock); - m_ullTotalSize += ullAdd; -} - -void TSubTaskProgressInfo::DecreaseTotalSize(unsigned long long ullSub) -{ - boost::unique_lock lock(m_lock); - m_ullTotalSize -= ullSub; -} - -void TSubTaskProgressInfo::SetTotalSize(unsigned long long ullSet) -{ - boost::unique_lock lock(m_lock); - m_ullTotalSize = ullSet; -} - -unsigned long long TSubTaskProgressInfo::GetTotalSize() const -{ - boost::shared_lock lock(m_lock); - return m_ullTotalSize; -} - -double TSubTaskProgressInfo::GetSizeProgressInPercent() const -{ - boost::shared_lock lock(m_lock); - - long double dPercent = 0; - - if(m_ullTotalSize != 0) - dPercent = (long double)m_ullProcessedSize / (long double)m_ullTotalSize; - - return (double)dPercent; -} - -void TSubTaskProgressInfo::SetTimeElapsed(time_t timeElapsed) -{ - boost::unique_lock lock(m_lock); - m_timeElapsed = timeElapsed; -} - -time_t TSubTaskProgressInfo::GetTimeElapsed() -{ - UpdateTime(); - - boost::shared_lock lock(m_lock); - return m_timeElapsed; -} - -void TSubTaskProgressInfo::EnableTimeTracking() -{ - boost::upgrade_lock lock(m_lock); - if(m_timeLast == -1) - { - boost::upgrade_to_unique_lock lock_upgraded(lock); - m_timeLast = time(NULL); - } -} - -void TSubTaskProgressInfo::DisableTimeTracking() -{ - UpdateTime(); - - boost::upgrade_lock lock(m_lock); - if(m_timeLast != -1) - { - boost::upgrade_to_unique_lock lock_upgraded(lock); - m_timeLast = -1; - } -} - -void TSubTaskProgressInfo::UpdateTime() -{ - boost::upgrade_lock lock(m_lock); - if(m_timeLast != -1) - { - time_t timeCurrent = time(NULL); - - boost::upgrade_to_unique_lock lock_upgraded(lock); - m_timeElapsed += timeCurrent - m_timeLast; - m_timeLast = timeCurrent; - } -} -*/ Index: src/ch/TSubTaskProgressInfo.h =================================================================== diff -u -N --- src/ch/TSubTaskProgressInfo.h (revision 8c87d4185fbe5b952c49f72afcfd5f9fca338fb4) +++ src/ch/TSubTaskProgressInfo.h (revision 0) @@ -1,99 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2010 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -/// @file TSubTaskProgressInfo.h -/// @date 2010/09/19 -/// @brief Contains declaration of class handling progress information for subtasks. -// ============================================================================ -#ifndef __TSUBTASKPROGRESSINFO_H__ -#define __TSUBTASKPROGRESSINFO_H__ - -/* - -/////////////////////////////////////////////////////////////////////////// -// TSubTaskProgressInfo - -class TSubTaskProgressInfo -{ -public: - TSubTaskProgressInfo(); - ~TSubTaskProgressInfo(); - - void GetSnapshot(TSubTaskProgressInfo& rDst) const; - - void Clear(); - - // count of data - void IncreaseProcessedCount(size_t stAdd); - void DecreaseProcessedCount(size_t stSub); - void SetProcessedCount(size_t stSet); - size_t GetProcessedCount() const; - - size_t GetUnProcessedCount() const; - - void IncreaseTotalCount(size_t stAdd); - void DecreaseTotalCount(size_t stSub); - void SetTotalCount(size_t stSet); - size_t GetTotalCount() const; - - double GetCountProgressInPercent() const; - - // size of data - void IncreaseProcessedSize(unsigned long long ullAdd); - void DecreaseProcessedSize(unsigned long long ullSub); - void SetProcessedSize(unsigned long long ullSet); - unsigned long long GetProcessedSize() const; - - unsigned long long GetUnProcessedSize() const; - - void IncreaseTotalSize(unsigned long long ullAdd); - void DecreaseTotalSize(unsigned long long ullSub); - void SetTotalSize(unsigned long long ullSet); - unsigned long long GetTotalSize() const; - - // calculated values - double GetSizeProgressInPercent() const; - - // time tracking - void SetTimeElapsed(time_t timeElapsed); - time_t GetTimeElapsed(); - - void EnableTimeTracking(); - void DisableTimeTracking(); - void UpdateTime(); - -private: - // count of data - volatile size_t m_stProcessedCount; - volatile size_t m_stTotalCount; - - // size of data - volatile unsigned long long m_ullProcessedSize; - volatile unsigned long long m_ullTotalSize; - - // time - volatile time_t m_timeElapsed; ///< How much time has elapsed from the start - volatile time_t m_timeLast; ///< Last time the time elapsed has been updated - - mutable boost::shared_mutex m_lock; -}; - -typedef boost::shared_ptr TSubTaskProgressInfoPtr; -*/ - -#endif // __TSUBTASKPROGRESSINFO_H__ \ No newline at end of file Index: src/ch/TTaskProgressInfo.cpp =================================================================== diff -u -N --- src/ch/TTaskProgressInfo.cpp (revision 8c87d4185fbe5b952c49f72afcfd5f9fca338fb4) +++ src/ch/TTaskProgressInfo.cpp (revision 0) @@ -1,127 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2009 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -/// @file TTaskProgressInfo.cpp -/// @date 2010/09/19 -/// @brief Contains implementation of classes related to task progress reporting. -// ============================================================================ -#include "stdafx.h" -#include "TTaskProgressInfo.h" -/* - -/////////////////////////////////////////////////////////////////////////// -// TProgressSnapshot - -TProgressSnapshot::TProgressSnapshot() : - m_stCurrentOperation(0), - m_dCountTotalProgress(0.0), - m_dSizeTotalProgress(0.0) -{ -} - -TProgressSnapshot::~TProgressSnapshot() -{ -} - -/////////////////////////////////////////////////////////////////////////// -// TTaskProgressInfo - -TTaskProgressInfo::TTaskProgressInfo() : - m_stSubOperationIndex(0) -{ -} - -TTaskProgressInfo::~TTaskProgressInfo() -{ -} - -void TTaskProgressInfo::CreateFromOperationPlan(const TOperationPlan& rOperationPlan) -{ - m_stSubOperationIndex = 0; - m_vProgressInfo.clear(); - - BOOST_ASSERT(rOperationPlan.GetSubOperationsCount() != 0); - if(rOperationPlan.GetSubOperationsCount() == 0) - return; - - for(size_t stIndex = 0; stIndex < rOperationPlan.GetSubOperationsCount(); ++stIndex) - { - TSubTaskProgressInfoPtr spProgressInfo(boost::make_shared()); - m_vProgressInfo.push_back(boost::make_tuple(rOperationPlan.GetSubOperationAt(stIndex), rOperationPlan.GetEstimatedTimeAt(stIndex), spProgressInfo)); - } -} - -void TTaskProgressInfo::GetProgressSnapshot(TProgressSnapshot& rSnapshot) const -{ - boost::shared_lock lock(m_lock); - - // current operation index - rSnapshot.m_stCurrentOperation = m_stSubOperationIndex; - - // reset other stats - rSnapshot.m_tCurrentSubTaskProgress.Clear(); - - // whole progress - rSnapshot.m_dCountTotalProgress = 0.0; - rSnapshot.m_dSizeTotalProgress = 0.0; - - for(size_t stIndex = 0; stIndex < m_vProgressInfo.size(); ++stIndex) - { - const boost::tuple& rProgressInfo = m_vProgressInfo.at(stIndex); - if(stIndex < m_stSubOperationIndex) - { - // this operation is already finished, so assuming 100% - rSnapshot.m_dCountTotalProgress += boost::get<1>(rProgressInfo); - rSnapshot.m_dSizeTotalProgress += boost::get<1>(rProgressInfo); - } - else if(stIndex == m_stSubOperationIndex) - { - // this operation is in progress, so calculate percentages and store snapshot of current subtask progress info - const TSubTaskProgressInfoPtr& spInfo = boost::get<2>(rProgressInfo); - if(!spInfo) - THROW(_T("Invalid pointer"), 0, 0, 0); - - rSnapshot.m_tCurrentSubTaskProgress.GetSnapshot(*spInfo); - - rSnapshot.m_dCountTotalProgress += spInfo->GetCountProgressInPercent() * boost::get<1>(rProgressInfo); - rSnapshot.m_dSizeTotalProgress += spInfo->GetSizeProgressInPercent() * boost::get<1>(rProgressInfo); - } - else - break; - } -} - -void TTaskProgressInfo::SetSubOperationIndex(size_t stSubOperationIndex) -{ - boost::unique_lock lock(m_lock); - m_stSubOperationIndex = stSubOperationIndex; -} - -size_t TTaskProgressInfo::GetSubOperationIndex() const -{ - boost::shared_lock lock(m_lock); - return m_stSubOperationIndex; -} - -void TTaskProgressInfo::IncreaseSubOperationIndex() -{ - boost::unique_lock lock(m_lock); - ++m_stSubOperationIndex; -} - -*/ Index: src/ch/TTaskProgressInfo.h =================================================================== diff -u -N --- src/ch/TTaskProgressInfo.h (revision 8c87d4185fbe5b952c49f72afcfd5f9fca338fb4) +++ src/ch/TTaskProgressInfo.h (revision 0) @@ -1,125 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2009 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -/// @file TTaskProgressInfo.h -/// @date 2010/09/19 -/// @brief File contains declarations of classes related to task progress reporting. -// ============================================================================ -#ifndef __TTASKPROGRESSINFO_H__ -#define __TTASKPROGRESSINFO_H__ -/* - -#include "TTaskOperationPlan.h" -#include "TSubTaskProgressInfo.h" - -/////////////////////////////////////////////////////////////////////////// -// TProgressSnapshot - -class TProgressSnapshot -{ -public: - TProgressSnapshot(); - ~TProgressSnapshot(); - - // total progress (percentage) of the whole task - double GetTaskCountProgress() const { return m_dCountTotalProgress; } - double GetTaskSizeProgress() const { return m_dSizeTotalProgress; } - - // progress of current subtask - const TSubTaskProgressInfo& GetCurrentSubTaskProgress() const { return m_tCurrentSubTaskProgress; } - - // index of current subtask in the operation plan - size_t GetCurrentSubTaskIndex() const; - -private: - // percentage progress based on count and size of items - double m_dCountTotalProgress; - double m_dSizeTotalProgress; - - // copy of progress of current subtask - TSubTaskProgressInfo m_tCurrentSubTaskProgress; - - // states which subtask is active at the moment - size_t m_stCurrentOperation; - - friend class TTaskProgressInfo; -}; - -/////////////////////////////////////////////////////////////////////////// -// TTaskProgressInfo - -class TTaskProgressInfo -{ -public: - TTaskProgressInfo(); - ~TTaskProgressInfo(); - - // initializes the progress info - void CreateFromOperationPlan(const TOperationPlan& rOperationPlan); - - // progress operations - void GetProgressSnapshot(TProgressSnapshot& rSnapshot) const; - - void SetSubOperationIndex(size_t stSubOperationIndex); - void IncreaseSubOperationIndex(); - size_t GetSubOperationIndex() const; - - // retrieve reference to the subtask progress info to pass it to the subtask itself - TSubTaskProgressInfo& GetProgressInfo(size_t stSubTaskIndex); - - // serialization - template - void load(Archive& ar, unsigned int / *uiVersion* /); - - template - void save(Archive& ar, unsigned int / *uiVersion* /) const; - - BOOST_SERIALIZATION_SPLIT_MEMBER(); - -private: - volatile size_t m_stSubOperationIndex; // index of sub-operation from TOperationDescription - - std::vector > m_vProgressInfo; - - mutable boost::shared_mutex m_lock; -}; - -template -void TTaskProgressInfo::load(Archive& ar, unsigned int / *uiVersion* /) -{ - boost::unique_lock lock(m_lock); - - ar >> m_vProgressInfo; - ar >> m_stSubOperationIndex; - - // note that m_stSubOperationIndex could be equal to m_vProgressInfo.size() - // in case all subtasks has already finished - if(m_stSubOperationIndex > m_vProgressInfo.size()) - THROW(_T("Corrupted progress data"), 0, 0, 0); -} - -template -void TTaskProgressInfo::save(Archive& ar, unsigned int / *uiVersion* /) const -{ - boost::shared_lock lock(m_lock); - - ar << m_vProgressInfo; - ar << m_stSubOperationIndex; -}*/ - -#endif // __TTASKPROGRESSINFO_H__ \ No newline at end of file Index: src/ch/ch.h =================================================================== diff -u -N -r633a533cb6e741d44fe28aa56339e1d2709b1b27 -r1e687d59f0e622a610cbf97cf79febd12641d159 --- src/ch/ch.h (.../ch.h) (revision 633a533cb6e741d44fe28aa56339e1d2709b1b27) +++ src/ch/ch.h (.../ch.h) (revision 1e687d59f0e622a610cbf97cf79febd12641d159) @@ -19,10 +19,6 @@ #ifndef __COPYHANDLER_H__ #define __COPYHANDLER_H__ -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - #include "resource.h" // main symbols #include "AppHelper.h" #include "CfgProperties.h" @@ -80,10 +76,4 @@ DECLARE_MESSAGE_MAP() }; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - #endif Index: src/ch/ch.vc110.vcxproj.filters =================================================================== diff -u -N -rdd61ac70dd276425fe97970b49b6854d02bfcc87 -r1e687d59f0e622a610cbf97cf79febd12641d159 --- src/ch/ch.vc110.vcxproj.filters (.../ch.vc110.vcxproj.filters) (revision dd61ac70dd276425fe97970b49b6854d02bfcc87) +++ src/ch/ch.vc110.vcxproj.filters (.../ch.vc110.vcxproj.filters) (revision 1e687d59f0e622a610cbf97cf79febd12641d159) @@ -11,9 +11,6 @@ {171564df-733a-4a4d-94b7-85a338322df2} - - {8c2a9c32-5647-4c69-8039-d69a34750f1c} - {a365bc2a-6549-4af8-8894-43de7415ef0f} @@ -80,12 +77,6 @@ Source Files\Core - - Source Files\Core\NewProgressTracking - - - Source Files\Core\NewProgressTracking - Source Files\Tools @@ -161,9 +152,6 @@ Source Files\GUI\Dialogs - - Source Files\GUI\Dialogs - Source Files\GUI\Dialogs @@ -214,12 +202,6 @@ Source Files\Core - - Source Files\Core\NewProgressTracking - - - Source Files\Core\NewProgressTracking - Source Files\Tools @@ -661,15 +643,6 @@ Localization\EN Help Files - - Localization\EN Help Files - - - Localization\EN Help Files - - - Localization\EN Help Files - Localization\EN Help Files @@ -712,15 +685,6 @@ Localization\PL Help Files - - Localization\PL Help Files - - - Localization\PL Help Files - - - Localization\PL Help Files - Localization\PL Help Files Index: src/libchcore/TBasePathData.h =================================================================== diff -u -N -rd88274a4bbfd4ef005d44c4d179b7596cb627486 -r1e687d59f0e622a610cbf97cf79febd12641d159 --- src/libchcore/TBasePathData.h (.../TBasePathData.h) (revision d88274a4bbfd4ef005d44c4d179b7596cb627486) +++ src/libchcore/TBasePathData.h (.../TBasePathData.h) (revision 1e687d59f0e622a610cbf97cf79febd12641d159) @@ -35,12 +35,7 @@ public: TBasePathData(); TBasePathData(const TBasePathData& rEntry); -/* - void SetMove(bool bValue) { m_bMove = bValue; } - bool GetMove() const { return m_bMove; } -*/ - bool GetSkipFurtherProcessing() const { return m_bSkipFurtherProcessing; } void SetSkipFurtherProcessing(bool bSkipFurtherProcessing) { m_bSkipFurtherProcessing = bSkipFurtherProcessing; } @@ -52,7 +47,6 @@ void Serialize(TWriteBinarySerializer& rSerializer, bool bData); private: - //bool m_bMove; // specifies if we can use MoveFile (if will be moved) bool m_bSkipFurtherProcessing; // specifies if the path should be (or not) processed further TSmartPath m_pathDst; // dest path }; Index: src/libchcore/TTask.cpp =================================================================== diff -u -N -rdd61ac70dd276425fe97970b49b6854d02bfcc87 -r1e687d59f0e622a610cbf97cf79febd12641d159 --- src/libchcore/TTask.cpp (.../TTask.cpp) (revision dd61ac70dd276425fe97970b49b6854d02bfcc87) +++ src/libchcore/TTask.cpp (.../TTask.cpp) (revision 1e687d59f0e622a610cbf97cf79febd12641d159) @@ -19,13 +19,6 @@ #include "Stdafx.h" #include "TTask.h" -#pragma warning(push) -#pragma warning(disable: 4996 4244 4310) - #include - #include - #include -#pragma warning(pop) - #include #include "TSubTaskScanDirectory.h" #include "TSubTaskCopyMove.h" @@ -418,18 +411,6 @@ return m_strTaskDirectory; } -void TTask::SetTaskFilePath(const TSmartPath& strFilePath) -{ - boost::unique_lock lock(m_lock); - m_strFilePath = strFilePath; -} - -TSmartPath TTask::GetTaskFilePath() const -{ - boost::shared_lock lock(m_lock); - return m_strFilePath; -} - void TTask::SetForceFlag(bool bFlag) { boost::unique_lock lock(m_lock); Index: src/libchcore/TTask.h =================================================================== diff -u -N -r12a1725bfd04b0f55fd0fda302975fdcd4174943 -r1e687d59f0e622a610cbf97cf79febd12641d159 --- src/libchcore/TTask.h (.../TTask.h) (revision 12a1725bfd04b0f55fd0fda302975fdcd4174943) +++ src/libchcore/TTask.h (.../TTask.h) (revision 1e687d59f0e622a610cbf97cf79febd12641d159) @@ -139,9 +139,6 @@ void SetTaskDirectory(const TSmartPath& strDir); TSmartPath GetTaskDirectory() const; - void SetTaskFilePath(const TSmartPath& strPath); - TSmartPath GetTaskFilePath() const; - void SetForceFlag(bool bFlag = true); bool GetForceFlag(); @@ -152,7 +149,7 @@ // Stats handling void GetTaskStats(TTaskStatsSnapshot& rSnapshot) const; -protected: +private: TTask(IFeedbackHandler* piFeedbackHandler, size_t stSessionUniqueID); void SetTaskDefinition(const TTaskDefinition& rTaskDefinition);