Fisheye: Tag 1e687d59f0e622a610cbf97cf79febd12641d159 refers to a dead (removed) revision in file `src/ch/DstFileErrorDlg.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1e687d59f0e622a610cbf97cf79febd12641d159 refers to a dead (removed) revision in file `src/ch/TSubTaskProgressInfo.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1e687d59f0e622a610cbf97cf79febd12641d159 refers to a dead (removed) revision in file `src/ch/TSubTaskProgressInfo.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1e687d59f0e622a610cbf97cf79febd12641d159 refers to a dead (removed) revision in file `src/ch/TTaskProgressInfo.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1e687d59f0e622a610cbf97cf79febd12641d159 refers to a dead (removed) revision in file `src/ch/TTaskProgressInfo.h'. Fisheye: No comparison available. Pass `N' to diff? Index: src/ch/ch.h =================================================================== diff -u -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 -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 -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 -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 -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);