Index: src/libchcore/TTaskManagerStatsSnapshot.cpp
===================================================================
diff -u -N -rb1ecc12ba4c1f2a7b4acd6e82fc4193535e55ff0 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TTaskManagerStatsSnapshot.cpp	(.../TTaskManagerStatsSnapshot.cpp)	(revision b1ecc12ba4c1f2a7b4acd6e82fc4193535e55ff0)
+++ src/libchcore/TTaskManagerStatsSnapshot.cpp	(.../TTaskManagerStatsSnapshot.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -24,183 +24,182 @@
 #include "TTaskManagerStatsSnapshot.h"
 #include "MathFunctions.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-////////////////////////////////////////////////////////////////////////////////
-// class TTaskManagerStatsSnapshot
-
-TTaskManagerStatsSnapshot::TTaskManagerStatsSnapshot() :
-	m_stRunningTasks(0),
-	m_bCacheFilled(false),
-	m_ullProcessedCount(0),
-	m_ullTotalCount(0),
-	m_ullProcessedSize(0),
-	m_ullTotalSize(0),
-	m_dCountSpeed(0.0),
-	m_dSizeSpeed(0.0),
-	m_dCombinedProgress(0.0),
-	m_dAvgCountSpeed(0.0),
-	m_dAvgSizeSpeed(0.0)
+namespace chcore
 {
-}
+	////////////////////////////////////////////////////////////////////////////////
+	// class TTaskManagerStatsSnapshot
 
-void TTaskManagerStatsSnapshot::Clear()
-{
-	m_stRunningTasks = 0;
-	m_bCacheFilled = false;
-	m_ullProcessedCount = 0;
-	m_ullTotalCount = 0;
-	m_ullProcessedSize = 0;
-	m_ullTotalSize = 0;
-	m_dCountSpeed = 0.0;
-	m_dSizeSpeed = 0.0;
-	m_dCombinedProgress = 0.0;
-	m_dAvgCountSpeed = 0.0;
-	m_dAvgSizeSpeed = 0.0;
+	TTaskManagerStatsSnapshot::TTaskManagerStatsSnapshot() :
+		m_stRunningTasks(0),
+		m_bCacheFilled(false),
+		m_ullProcessedCount(0),
+		m_ullTotalCount(0),
+		m_ullProcessedSize(0),
+		m_ullTotalSize(0),
+		m_dCountSpeed(0.0),
+		m_dSizeSpeed(0.0),
+		m_dCombinedProgress(0.0),
+		m_dAvgCountSpeed(0.0),
+		m_dAvgSizeSpeed(0.0)
+	{
+	}
 
-	m_vTasksSnapshots.clear();
-}
+	void TTaskManagerStatsSnapshot::Clear()
+	{
+		m_stRunningTasks = 0;
+		m_bCacheFilled = false;
+		m_ullProcessedCount = 0;
+		m_ullTotalCount = 0;
+		m_ullProcessedSize = 0;
+		m_ullTotalSize = 0;
+		m_dCountSpeed = 0.0;
+		m_dSizeSpeed = 0.0;
+		m_dCombinedProgress = 0.0;
+		m_dAvgCountSpeed = 0.0;
+		m_dAvgSizeSpeed = 0.0;
 
-void TTaskManagerStatsSnapshot::AddTaskStats(const TTaskStatsSnapshotPtr& spStats)
-{
-	m_vTasksSnapshots.push_back(spStats);
-}
+		m_vTasksSnapshots.clear();
+	}
 
-size_t TTaskManagerStatsSnapshot::GetTaskStatsCount() const
-{
-	return m_vTasksSnapshots.size();
-}
+	void TTaskManagerStatsSnapshot::AddTaskStats(const TTaskStatsSnapshotPtr& spStats)
+	{
+		m_vTasksSnapshots.push_back(spStats);
+	}
 
-TTaskStatsSnapshotPtr TTaskManagerStatsSnapshot::GetTaskStatsAt(size_t stIndex) const
-{
-	if(stIndex >= m_vTasksSnapshots.size())
-		return TTaskStatsSnapshotPtr();
+	size_t TTaskManagerStatsSnapshot::GetTaskStatsCount() const
+	{
+		return m_vTasksSnapshots.size();
+	}
 
-	return m_vTasksSnapshots[stIndex];
-}
-
-TTaskStatsSnapshotPtr TTaskManagerStatsSnapshot::GetTaskStatsForTaskID(taskid_t tTaskID) const
-{
-	BOOST_FOREACH(TTaskStatsSnapshotPtr spStats, m_vTasksSnapshots)
+	TTaskStatsSnapshotPtr TTaskManagerStatsSnapshot::GetTaskStatsAt(size_t stIndex) const
 	{
-		if(spStats->GetTaskID() == tTaskID)
-			return spStats;
+		if (stIndex >= m_vTasksSnapshots.size())
+			return TTaskStatsSnapshotPtr();
+
+		return m_vTasksSnapshots[stIndex];
 	}
 
-	return TTaskStatsSnapshotPtr();
-}
+	TTaskStatsSnapshotPtr TTaskManagerStatsSnapshot::GetTaskStatsForTaskID(taskid_t tTaskID) const
+	{
+		BOOST_FOREACH(TTaskStatsSnapshotPtr spStats, m_vTasksSnapshots)
+		{
+			if (spStats->GetTaskID() == tTaskID)
+				return spStats;
+		}
 
+		return TTaskStatsSnapshotPtr();
+	}
 
-void TTaskManagerStatsSnapshot::CalculateProgressAndSpeeds() const
-{
-	m_bCacheFilled = false;
-	m_ullProcessedCount = 0;
-	m_ullTotalCount = 0;
-	m_ullProcessedSize = 0;
-	m_ullTotalSize = 0;
-	m_dCountSpeed = 0.0;
-	m_dSizeSpeed = 0.0;
-	m_dCombinedProgress = 0.0;
-	m_dAvgCountSpeed = 0.0;
-	m_dAvgSizeSpeed = 0.0;
 
-	BOOST_FOREACH(TTaskStatsSnapshotPtr spTaskStats, m_vTasksSnapshots)
+	void TTaskManagerStatsSnapshot::CalculateProgressAndSpeeds() const
 	{
-		m_ullProcessedCount += spTaskStats->GetProcessedCount();
-		m_ullTotalCount += spTaskStats->GetTotalCount();
+		m_bCacheFilled = false;
+		m_ullProcessedCount = 0;
+		m_ullTotalCount = 0;
+		m_ullProcessedSize = 0;
+		m_ullTotalSize = 0;
+		m_dCountSpeed = 0.0;
+		m_dSizeSpeed = 0.0;
+		m_dCombinedProgress = 0.0;
+		m_dAvgCountSpeed = 0.0;
+		m_dAvgSizeSpeed = 0.0;
 
-		m_ullProcessedSize += spTaskStats->GetProcessedSize();
-		m_ullTotalSize += spTaskStats->GetTotalSize();
+		BOOST_FOREACH(TTaskStatsSnapshotPtr spTaskStats, m_vTasksSnapshots)
+		{
+			m_ullProcessedCount += spTaskStats->GetProcessedCount();
+			m_ullTotalCount += spTaskStats->GetTotalCount();
 
-		m_dCountSpeed += spTaskStats->GetCountSpeed();
-		m_dSizeSpeed += spTaskStats->GetSizeSpeed();
+			m_ullProcessedSize += spTaskStats->GetProcessedSize();
+			m_ullTotalSize += spTaskStats->GetTotalSize();
 
-		m_dAvgCountSpeed += spTaskStats->GetAvgCountSpeed();
-		m_dAvgSizeSpeed += spTaskStats->GetAvgSizeSpeed();
-	}
+			m_dCountSpeed += spTaskStats->GetCountSpeed();
+			m_dSizeSpeed += spTaskStats->GetSizeSpeed();
 
-	// we're treating each of the items as 512B object to process
-	// to have some balance between items' count and items' size in
-	// progress information
-	unsigned long long ullProcessed = 512ULL * m_ullProcessedCount + m_ullProcessedSize;
-	unsigned long long ullTotal = 512ULL * m_ullTotalCount + m_ullTotalSize;
+			m_dAvgCountSpeed += spTaskStats->GetAvgCountSpeed();
+			m_dAvgSizeSpeed += spTaskStats->GetAvgSizeSpeed();
+		}
 
-	if(ullTotal != 0)
-		m_dCombinedProgress = Math::Div64(ullProcessed, ullTotal);
+		// we're treating each of the items as 512B object to process
+		// to have some balance between items' count and items' size in
+		// progress information
+		unsigned long long ullProcessed = 512ULL * m_ullProcessedCount + m_ullProcessedSize;
+		unsigned long long ullTotal = 512ULL * m_ullTotalCount + m_ullTotalSize;
 
-	m_bCacheFilled = true;
-}
+		if (ullTotal != 0)
+			m_dCombinedProgress = Math::Div64(ullProcessed, ullTotal);
 
-unsigned long long TTaskManagerStatsSnapshot::GetProcessedCount() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		m_bCacheFilled = true;
+	}
 
-	return m_ullProcessedCount;
-}
+	unsigned long long TTaskManagerStatsSnapshot::GetProcessedCount() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-unsigned long long TTaskManagerStatsSnapshot::GetTotalCount() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		return m_ullProcessedCount;
+	}
 
-	return m_ullTotalCount;
-}
+	unsigned long long TTaskManagerStatsSnapshot::GetTotalCount() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-unsigned long long TTaskManagerStatsSnapshot::GetProcessedSize() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		return m_ullTotalCount;
+	}
 
-	return m_ullProcessedSize;
-}
+	unsigned long long TTaskManagerStatsSnapshot::GetProcessedSize() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-unsigned long long TTaskManagerStatsSnapshot::GetTotalSize() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		return m_ullProcessedSize;
+	}
 
-	return m_ullTotalSize;
-}
+	unsigned long long TTaskManagerStatsSnapshot::GetTotalSize() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-double TTaskManagerStatsSnapshot::GetCountSpeed() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		return m_ullTotalSize;
+	}
 
-	return m_dCountSpeed;
-}
+	double TTaskManagerStatsSnapshot::GetCountSpeed() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-double TTaskManagerStatsSnapshot::GetSizeSpeed() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		return m_dCountSpeed;
+	}
 
-	return m_dSizeSpeed;
-}
+	double TTaskManagerStatsSnapshot::GetSizeSpeed() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-double TTaskManagerStatsSnapshot::GetCombinedProgress() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		return m_dSizeSpeed;
+	}
 
-	return m_dCombinedProgress;
-}
+	double TTaskManagerStatsSnapshot::GetCombinedProgress() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-double TTaskManagerStatsSnapshot::GetAvgCountSpeed() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		return m_dCombinedProgress;
+	}
 
-	return m_dAvgCountSpeed;
-}
+	double TTaskManagerStatsSnapshot::GetAvgCountSpeed() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-double TTaskManagerStatsSnapshot::GetAvgSizeSpeed() const
-{
-	if(!m_bCacheFilled)
-		CalculateProgressAndSpeeds();
+		return m_dAvgCountSpeed;
+	}
 
-	return m_dAvgSizeSpeed;
-}
+	double TTaskManagerStatsSnapshot::GetAvgSizeSpeed() const
+	{
+		if (!m_bCacheFilled)
+			CalculateProgressAndSpeeds();
 
-END_CHCORE_NAMESPACE
+		return m_dAvgSizeSpeed;
+	}
+}