Index: src/libchcore/TTaskOperationPlan.cpp
===================================================================
diff -u -N -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TTaskOperationPlan.cpp	(.../TTaskOperationPlan.cpp)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
+++ src/libchcore/TTaskOperationPlan.cpp	(.../TTaskOperationPlan.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -25,62 +25,62 @@
 #include "TCoreException.h"
 #include "ErrorCodes.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-////////////////////////////////////////////////////////////////////////////
-// class TOperationPlan
-
-TOperationPlan::TOperationPlan() :
-	m_eOperation(eOperation_None)
+namespace chcore
 {
-}
+	////////////////////////////////////////////////////////////////////////////
+	// class TOperationPlan
 
-TOperationPlan::TOperationPlan(const TOperationPlan& rSrc) :
-m_eOperation(eOperation_None),
-	m_vSubOperations()
-{
-	boost::shared_lock<boost::shared_mutex> src_lock(rSrc.m_lock);
+	TOperationPlan::TOperationPlan() :
+		m_eOperation(eOperation_None)
+	{
+	}
 
-	m_eOperation = rSrc.m_eOperation;
-	m_vSubOperations = rSrc.m_vSubOperations;
-}
-
-TOperationPlan::~TOperationPlan()
-{
-}
-
-TOperationPlan& TOperationPlan::operator=(const TOperationPlan& rSrc)
-{
-	if(this != &rSrc)
+	TOperationPlan::TOperationPlan(const TOperationPlan& rSrc) :
+		m_eOperation(eOperation_None),
+		m_vSubOperations()
 	{
 		boost::shared_lock<boost::shared_mutex> src_lock(rSrc.m_lock);
-		boost::unique_lock<boost::shared_mutex> lock(m_lock);
 
 		m_eOperation = rSrc.m_eOperation;
 		m_vSubOperations = rSrc.m_vSubOperations;
 	}
 
-	return *this;
-}
+	TOperationPlan::~TOperationPlan()
+	{
+	}
 
-void TOperationPlan::SetOperationType(EOperationType eOperation)
-{
-	switch(eOperation)
+	TOperationPlan& TOperationPlan::operator=(const TOperationPlan& rSrc)
 	{
-	case eOperation_None:
-		THROW_CORE_EXCEPTION(eErr_InvalidArgument);
-		break;
+		if (this != &rSrc)
+		{
+			boost::shared_lock<boost::shared_mutex> src_lock(rSrc.m_lock);
+			boost::unique_lock<boost::shared_mutex> lock(m_lock);
 
-	case eOperation_Copy:
+			m_eOperation = rSrc.m_eOperation;
+			m_vSubOperations = rSrc.m_vSubOperations;
+		}
+
+		return *this;
+	}
+
+	void TOperationPlan::SetOperationType(EOperationType eOperation)
+	{
+		switch (eOperation)
 		{
+		case eOperation_None:
+			THROW_CORE_EXCEPTION(eErr_InvalidArgument);
+			break;
+
+		case eOperation_Copy:
+		{
 			boost::unique_lock<boost::shared_mutex> lock(m_lock);
 			m_vSubOperations.clear();
 			m_vSubOperations.push_back(std::make_pair(eSubOperation_Scanning, 0.05));
 			m_vSubOperations.push_back(std::make_pair(eSubOperation_Copying, 0.95));
 			break;
 		}
 
-	case eOperation_Move:
+		case eOperation_Move:
 		{
 			boost::unique_lock<boost::shared_mutex> lock(m_lock);
 			m_vSubOperations.clear();
@@ -90,43 +90,42 @@
 			break;
 		}
 
-	BOOST_STATIC_ASSERT(eOperation_Move == eOperation_Max - 1);
+		BOOST_STATIC_ASSERT(eOperation_Move == eOperation_Max - 1);
 
-	default:
-		THROW_CORE_EXCEPTION(eErr_UnhandledCase);
+		default:
+			THROW_CORE_EXCEPTION(eErr_UnhandledCase);
+		}
+
+		m_eOperation = eOperation;
 	}
 
-	m_eOperation = eOperation;
-}
+	EOperationType TOperationPlan::GetOperationType() const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		return m_eOperation;
+	}
 
-EOperationType TOperationPlan::GetOperationType() const
-{
-	boost::shared_lock<boost::shared_mutex> lock(m_lock);
-	return m_eOperation;
-}
+	size_t TOperationPlan::GetSubOperationsCount() const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		return m_vSubOperations.size();
+	}
 
-size_t TOperationPlan::GetSubOperationsCount() const
-{
-	boost::shared_lock<boost::shared_mutex> lock(m_lock);
-	return m_vSubOperations.size();
-}
+	ESubOperationType TOperationPlan::GetSubOperationAt(size_t stIndex) const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		if (stIndex >= m_vSubOperations.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+		else
+			return m_vSubOperations[stIndex].first;
+	}
 
-ESubOperationType TOperationPlan::GetSubOperationAt(size_t stIndex) const
-{
-	boost::shared_lock<boost::shared_mutex> lock(m_lock);
-	if(stIndex >= m_vSubOperations.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
-	else
-		return m_vSubOperations[stIndex].first;
+	double TOperationPlan::GetEstimatedTimeAt(size_t stIndex) const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		if (stIndex >= m_vSubOperations.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+		else
+			return m_vSubOperations[stIndex].second;
+	}
 }
-
-double TOperationPlan::GetEstimatedTimeAt(size_t stIndex) const
-{
-	boost::shared_lock<boost::shared_mutex> lock(m_lock);
-	if(stIndex >= m_vSubOperations.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
-	else
-		return m_vSubOperations[stIndex].second;
-}
-
-END_CHCORE_NAMESPACE