Index: src/libchcore/TSubTaskStatsSnapshot.h
===================================================================
diff -u -N -r11b0a299be97bc3afaa633d6522c17b214ba3b79 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TSubTaskStatsSnapshot.h	(.../TSubTaskStatsSnapshot.h)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
+++ src/libchcore/TSubTaskStatsSnapshot.h	(.../TSubTaskStatsSnapshot.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -28,105 +28,104 @@
 #include "ESubTaskTypes.h"
 #include "CommonDataTypes.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-class LIBCHCORE_API TSubTaskStatsSnapshot
+namespace chcore
 {
-public:
-	TSubTaskStatsSnapshot();
+	class LIBCHCORE_API TSubTaskStatsSnapshot
+	{
+	public:
+		TSubTaskStatsSnapshot();
 
-	void Clear();
+		void Clear();
 
-	// is running?
-	void SetRunning(bool bRunning) { m_bSubTaskIsRunning = bRunning; }
-	bool IsRunning() const { return m_bSubTaskIsRunning; }
+		// is running?
+		void SetRunning(bool bRunning) { m_bSubTaskIsRunning = bRunning; }
+		bool IsRunning() const { return m_bSubTaskIsRunning; }
 
-	// count stats
-	void SetProcessedCount(file_count_t fcIndex) { m_fcProcessedCount = fcIndex; }
-	file_count_t GetProcessedCount() const { return m_fcProcessedCount; }
+		// count stats
+		void SetProcessedCount(file_count_t fcIndex) { m_fcProcessedCount = fcIndex; }
+		file_count_t GetProcessedCount() const { return m_fcProcessedCount; }
 
-	void SetTotalCount(file_count_t fcCount) { m_fcTotalCount = fcCount; }
-	file_count_t GetTotalCount() const { return m_fcTotalCount; }
+		void SetTotalCount(file_count_t fcCount) { m_fcTotalCount = fcCount; }
+		file_count_t GetTotalCount() const { return m_fcTotalCount; }
 
-	// size stats
-	void SetProcessedSize(unsigned long long ullProcessedSize) { m_ullProcessedSize = ullProcessedSize; }
-	unsigned long long GetProcessedSize() const { return m_ullProcessedSize; }
+		// size stats
+		void SetProcessedSize(unsigned long long ullProcessedSize) { m_ullProcessedSize = ullProcessedSize; }
+		unsigned long long GetProcessedSize() const { return m_ullProcessedSize; }
 
-	void SetTotalSize(unsigned long long ullTotalSize) { m_ullTotalSize = ullTotalSize; }
-	unsigned long long GetTotalSize() const { return m_ullTotalSize; }
+		void SetTotalSize(unsigned long long ullTotalSize) { m_ullTotalSize = ullTotalSize; }
+		unsigned long long GetTotalSize() const { return m_ullTotalSize; }
 
-	// current file
-	void SetCurrentItemProcessedSize(unsigned long long ullProcessedSize) { m_ullCurrentItemProcessedSize = ullProcessedSize; }
-	unsigned long long GetCurrentItemProcessedSize() const { return m_ullCurrentItemProcessedSize; }
+		// current file
+		void SetCurrentItemProcessedSize(unsigned long long ullProcessedSize) { m_ullCurrentItemProcessedSize = ullProcessedSize; }
+		unsigned long long GetCurrentItemProcessedSize() const { return m_ullCurrentItemProcessedSize; }
 
-	void SetCurrentItemTotalSize(unsigned long long ullTotalSize) { m_ullCurrentItemTotalSize = ullTotalSize; }
-	unsigned long long GetCurrentItemTotalSize() const { return m_ullCurrentItemTotalSize; }
+		void SetCurrentItemTotalSize(unsigned long long ullTotalSize) { m_ullCurrentItemTotalSize = ullTotalSize; }
+		unsigned long long GetCurrentItemTotalSize() const { return m_ullCurrentItemTotalSize; }
 
-	void SetCurrentIndex(file_count_t fcCurrentIndex) { m_fcCurrentIndex = fcCurrentIndex; }
-	file_count_t GetCurrentIndex() const { return m_fcCurrentIndex; }
+		void SetCurrentIndex(file_count_t fcCurrentIndex) { m_fcCurrentIndex = fcCurrentIndex; }
+		file_count_t GetCurrentIndex() const { return m_fcCurrentIndex; }
 
-	// progress in percent
-	double GetCombinedProgress() const;	// returns progress [0.0, 1.0]
+		// progress in percent
+		double GetCombinedProgress() const;	// returns progress [0.0, 1.0]
 
-	// buffer index
-	void SetCurrentBufferIndex(int iCurrentIndex) { m_iCurrentBufferIndex = iCurrentIndex; }
-	int GetCurrentBufferIndex() const { return m_iCurrentBufferIndex; }
+		// buffer index
+		void SetCurrentBufferIndex(int iCurrentIndex) { m_iCurrentBufferIndex = iCurrentIndex; }
+		int GetCurrentBufferIndex() const { return m_iCurrentBufferIndex; }
 
-	// current path
-	void SetCurrentPath(const TString& strPath) { m_strCurrentPath = strPath; }
-	const TString& GetCurrentPath() const { return m_strCurrentPath; }
+		// current path
+		void SetCurrentPath(const TString& strPath) { m_strCurrentPath = strPath; }
+		const TString& GetCurrentPath() const { return m_strCurrentPath; }
 
-	// time
-	void SetTimeElapsed(unsigned long long timeElapsed) { m_timeElapsed = timeElapsed; }
-	unsigned long long GetTimeElapsed() { return m_timeElapsed; }
+		// time
+		void SetTimeElapsed(unsigned long long timeElapsed) { m_timeElapsed = timeElapsed; }
+		unsigned long long GetTimeElapsed() { return m_timeElapsed; }
 
-	// time estimations
-	unsigned long long GetEstimatedTotalTime() const;
+		// time estimations
+		unsigned long long GetEstimatedTotalTime() const;
 
-	// speed
-	void SetSizeSpeed(double dSizeSpeed);
-	double GetSizeSpeed() const { return m_dSizeSpeed; }
-	void SetCountSpeed(double dCountSpeed);
-	double GetCountSpeed() const { return m_dCountSpeed; }
+		// speed
+		void SetSizeSpeed(double dSizeSpeed);
+		double GetSizeSpeed() const { return m_dSizeSpeed; }
+		void SetCountSpeed(double dCountSpeed);
+		double GetCountSpeed() const { return m_dCountSpeed; }
 
-	double GetAvgSizeSpeed() const;
-	double GetAvgCountSpeed() const;
+		double GetAvgSizeSpeed() const;
+		double GetAvgCountSpeed() const;
 
-	ESubOperationType GetSubOperationType() const { return m_eSubOperationType; }
-	void SetSubOperationType(ESubOperationType val) { m_eSubOperationType = val; }
+		ESubOperationType GetSubOperationType() const { return m_eSubOperationType; }
+		void SetSubOperationType(ESubOperationType val) { m_eSubOperationType = val; }
 
-private:
-	double CalculateProgress() const;
+	private:
+		double CalculateProgress() const;
 
-private:
-	bool m_bSubTaskIsRunning;
+	private:
+		bool m_bSubTaskIsRunning;
 
-	// subtask size and size speed per second
-	unsigned long long m_ullTotalSize;
-	unsigned long long m_ullProcessedSize;
-	double m_dSizeSpeed;
+		// subtask size and size speed per second
+		unsigned long long m_ullTotalSize;
+		unsigned long long m_ullProcessedSize;
+		double m_dSizeSpeed;
 
-	// subtask count of items and its speed per second
-	file_count_t m_fcTotalCount;
-	file_count_t m_fcProcessedCount;
-	double m_dCountSpeed;
+		// subtask count of items and its speed per second
+		file_count_t m_fcTotalCount;
+		file_count_t m_fcProcessedCount;
+		double m_dCountSpeed;
 
-	// current item size
-	unsigned long long m_ullCurrentItemTotalSize;
-	unsigned long long m_ullCurrentItemProcessedSize;
-	file_count_t m_fcCurrentIndex;
+		// current item size
+		unsigned long long m_ullCurrentItemTotalSize;
+		unsigned long long m_ullCurrentItemProcessedSize;
+		file_count_t m_fcCurrentIndex;
 
-	ESubOperationType m_eSubOperationType;
+		ESubOperationType m_eSubOperationType;
 
-	int m_iCurrentBufferIndex;
+		int m_iCurrentBufferIndex;
 
-	TString m_strCurrentPath;		// currently processed path
+		TString m_strCurrentPath;		// currently processed path
 
-	unsigned long long m_timeElapsed;			// time really elapsed for the subtask
-};
+		unsigned long long m_timeElapsed;			// time really elapsed for the subtask
+	};
 
-typedef boost::shared_ptr<TSubTaskStatsSnapshot> TSubTaskStatsSnapshotPtr;
+	typedef boost::shared_ptr<TSubTaskStatsSnapshot> TSubTaskStatsSnapshotPtr;
+}
 
-END_CHCORE_NAMESPACE
-
 #endif