Index: src/libchcore/TSubTaskCopyMove.h
===================================================================
diff -u -N -r27c262eb9cae55720e10f4886af6b5a82cb94fe9 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TSubTaskCopyMove.h	(.../TSubTaskCopyMove.h)	(revision 27c262eb9cae55720e10f4886af6b5a82cb94fe9)
+++ src/libchcore/TSubTaskCopyMove.h	(.../TSubTaskCopyMove.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -29,76 +29,75 @@
 #include "TBufferSizes.h"
 #include "IFilesystemFile.h"
 
-BEGIN_CHCORE_NAMESPACE
+namespace chcore
+{
+	class TLocalFilesystemFile;
+	typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+	struct CUSTOM_COPY_PARAMS;
 
-class TLocalFilesystemFile;
-typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
-struct CUSTOM_COPY_PARAMS;
+	class TDataBufferManager;
+	class TSimpleDataBuffer;
+	class TBufferSizes;
+	class TOverlappedDataBufferQueue;
+	class TOverlappedDataBuffer;
 
-class TDataBufferManager;
-class TSimpleDataBuffer;
-class TBufferSizes;
-class TOverlappedDataBufferQueue;
-class TOverlappedDataBuffer;
+	class LIBCHCORE_API TSubTaskCopyMove : public TSubTaskBase
+	{
+	public:
+		TSubTaskCopyMove(TSubTaskContext& tSubTaskContext);
 
-class LIBCHCORE_API TSubTaskCopyMove : public TSubTaskBase
-{
-public:
-	TSubTaskCopyMove(TSubTaskContext& tSubTaskContext);
+		virtual void Reset();
 
-	virtual void Reset();
+		virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override;
+		virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Copying; }
 
-	virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override;
-	virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Copying; }
+		virtual void Store(const ISerializerPtr& spSerializer) const;
+		virtual void Load(const ISerializerPtr& spSerializer);
 
-	virtual void Store(const ISerializerPtr& spSerializer) const;
-	virtual void Load(const ISerializerPtr& spSerializer);
+		void InitColumns(const ISerializerContainerPtr& spContainer) const;
 
-	void InitColumns(const ISerializerContainerPtr& spContainer) const;
+		virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const;
 
-	virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const;
+	private:
+		TBufferSizes::EBufferType GetBufferIndex(const TBufferSizes& rBufferSizes, const TFileInfoPtr& spFileInfo);
+		bool AdjustBufferIfNeeded(TOverlappedDataBufferQueue& rBuffer, TBufferSizes& rBufferSizes, bool bForce = false);
 
-private:
-	TBufferSizes::EBufferType GetBufferIndex(const TBufferSizes& rBufferSizes, const TFileInfoPtr& spFileInfo);
-	bool AdjustBufferIfNeeded(TOverlappedDataBufferQueue& rBuffer, TBufferSizes& rBufferSizes, bool bForce = false);
+		ESubOperationResult CustomCopyFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, CUSTOM_COPY_PARAMS* pData);
 
-	ESubOperationResult CustomCopyFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, CUSTOM_COPY_PARAMS* pData);
+		ESubOperationResult OpenSrcAndDstFilesFB(const IFeedbackHandlerPtr& spFeedbackHandler, CUSTOM_COPY_PARAMS* pData,
+			const IFilesystemFilePtr& spFileSrc, const IFilesystemFilePtr& spFileDst, bool bNoBuffer, bool& bSkip);
 
-	ESubOperationResult OpenSrcAndDstFilesFB(const IFeedbackHandlerPtr& spFeedbackHandler, CUSTOM_COPY_PARAMS* pData,
-		const IFilesystemFilePtr& spFileSrc, const IFilesystemFilePtr& spFileDst, bool bNoBuffer, bool& bSkip);
+		ESubOperationResult OpenSourceFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& fileSrc, bool bNoBuffering);
+		ESubOperationResult OpenDestinationFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& fileDst, bool bNoBuffering, const TFileInfoPtr& spSrcFileInfo,
+			unsigned long long& ullSeekTo, bool& bFreshlyCreated);
+		ESubOperationResult OpenExistingDestinationFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& fileDst, bool bNoBuffering);
 
-	ESubOperationResult OpenSourceFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& fileSrc, bool bNoBuffering);
-	ESubOperationResult OpenDestinationFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& fileDst, bool bNoBuffering, const TFileInfoPtr& spSrcFileInfo,
-		unsigned long long& ullSeekTo, bool& bFreshlyCreated);
-	ESubOperationResult OpenExistingDestinationFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& fileDst, bool bNoBuffering);
+		ESubOperationResult TruncateFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& file, long long llNewSize,
+			const TSmartPath& pathFile, bool& bSkip);
 
-	ESubOperationResult TruncateFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& file, long long llNewSize,
-		const TSmartPath& pathFile, bool& bSkip);
+		ESubOperationResult ReadFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& file,
+			TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip);
+		ESubOperationResult HandleReadError(const IFeedbackHandlerPtr& spFeedbackHandler, TOverlappedDataBuffer& rBuffer,
+			const TSmartPath& pathFile, bool& bSkip);
 
-	ESubOperationResult ReadFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& file,
-		TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip);
-	ESubOperationResult HandleReadError(const IFeedbackHandlerPtr& spFeedbackHandler, TOverlappedDataBuffer& rBuffer,
-		const TSmartPath& pathFile, bool& bSkip);
+		ESubOperationResult WriteFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& file,
+			TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip);
+		ESubOperationResult HandleWriteError(const IFeedbackHandlerPtr& spFeedbackHandler, TOverlappedDataBuffer& rBuffer,
+			const TSmartPath& pathFile, bool& bSkip);
 
-	ESubOperationResult WriteFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& file,
-		TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip);
-	ESubOperationResult HandleWriteError(const IFeedbackHandlerPtr& spFeedbackHandler, TOverlappedDataBuffer& rBuffer,
-		const TSmartPath& pathFile, bool& bSkip);
+		ESubOperationResult FinalizeFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& file,
+			TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip);
 
-	ESubOperationResult FinalizeFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& file,
-		TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip);
+		ESubOperationResult CreateDirectoryFB(const IFeedbackHandlerPtr& spFeedbackHandler, const TSmartPath& pathDirectory);
 
-	ESubOperationResult CreateDirectoryFB(const IFeedbackHandlerPtr& spFeedbackHandler, const TSmartPath& pathDirectory);
+		ESubOperationResult CheckForFreeSpaceFB(const IFeedbackHandlerPtr& spFeedbackHandler);
 
-	ESubOperationResult CheckForFreeSpaceFB(const IFeedbackHandlerPtr& spFeedbackHandler);
-
-private:
+	private:
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	TSubTaskStatsInfo m_tSubTaskStats;
+		TSubTaskStatsInfo m_tSubTaskStats;
 #pragma warning(pop)
-};
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif