Index: src/libchcore/TSubTaskBase.h
===================================================================
diff -u -N -r6103ac74583f2136b821dc67515ed8469abd8155 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TSubTaskBase.h	(.../TSubTaskBase.h)	(revision 6103ac74583f2136b821dc67515ed8469abd8155)
+++ src/libchcore/TSubTaskBase.h	(.../TSubTaskBase.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -30,62 +30,61 @@
 #include "ISerializer.h"
 #include "IFeedbackHandler.h"
 
-BEGIN_CHCORE_NAMESPACE
+namespace chcore
+{
+	class TSubTaskContext;
+	class TFileInfo;
+	typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
 
-class TSubTaskContext;
-class TFileInfo;
-typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+	///////////////////////////////////////////////////////////////////////////
+	// TSubTaskBase
 
-///////////////////////////////////////////////////////////////////////////
-// TSubTaskBase
-
-class LIBCHCORE_API TSubTaskBase
-{
-public:
-	enum ESubOperationResult
+	class LIBCHCORE_API TSubTaskBase
 	{
-		eSubResult_Continue,
-		eSubResult_KillRequest,
-		eSubResult_Error,
-		eSubResult_CancelRequest,
-		eSubResult_PauseRequest,
-		eSubResult_Retry,
-	};
+	public:
+		enum ESubOperationResult
+		{
+			eSubResult_Continue,
+			eSubResult_KillRequest,
+			eSubResult_Error,
+			eSubResult_CancelRequest,
+			eSubResult_PauseRequest,
+			eSubResult_Retry,
+		};
 
-public:
-	TSubTaskBase(TSubTaskContext& rContext);
-	virtual ~TSubTaskBase();
+	public:
+		TSubTaskBase(TSubTaskContext& rContext);
+		virtual ~TSubTaskBase();
 
-	virtual void Reset() = 0;
+		virtual void Reset() = 0;
 
-	virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) = 0;
-	virtual ESubOperationType GetSubOperationType() const = 0;
+		virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) = 0;
+		virtual ESubOperationType GetSubOperationType() const = 0;
 
-	// serialization
-	virtual void Store(const ISerializerPtr& spSerializer) const = 0;
-	virtual void Load(const ISerializerPtr& spSerializer) = 0;
+		// serialization
+		virtual void Store(const ISerializerPtr& spSerializer) const = 0;
+		virtual void Load(const ISerializerPtr& spSerializer) = 0;
 
-	// stats
-	virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const = 0;
+		// stats
+		virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const = 0;
 
-protected:
-	// some common operations
-	TSubTaskContext& GetContext() { return m_rContext; }
-	const TSubTaskContext& GetContext() const { return m_rContext; }
+	protected:
+		// some common operations
+		TSubTaskContext& GetContext() { return m_rContext; }
+		const TSubTaskContext& GetContext() const { return m_rContext; }
 
-	TSmartPath CalculateDestinationPath(const TFileInfoPtr& spFileInfo, TSmartPath pathDst, int iFlags);
-	TSmartPath FindFreeSubstituteName(TSmartPath pathSrcPath, TSmartPath pathDstPath) const;
+		TSmartPath CalculateDestinationPath(const TFileInfoPtr& spFileInfo, TSmartPath pathDst, int iFlags);
+		TSmartPath FindFreeSubstituteName(TSmartPath pathSrcPath, TSmartPath pathDstPath) const;
 
-private:
-	TSubTaskBase(const TSubTaskBase&);
-	TSubTaskBase& operator=(const TSubTaskBase&);
+	private:
+		TSubTaskBase(const TSubTaskBase&);
+		TSubTaskBase& operator=(const TSubTaskBase&);
 
-private:
-	TSubTaskContext& m_rContext;
-};
+	private:
+		TSubTaskContext& m_rContext;
+	};
 
-typedef boost::shared_ptr<TSubTaskBase> TSubTaskBasePtr;
+	typedef boost::shared_ptr<TSubTaskBase> TSubTaskBasePtr;
+}
 
-END_CHCORE_NAMESPACE
-
 #endif