Index: src/libchcore/TTaskBaseData.cpp
===================================================================
diff -u -N -r11b0a299be97bc3afaa633d6522c17b214ba3b79 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TTaskBaseData.cpp	(.../TTaskBaseData.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
+++ src/libchcore/TTaskBaseData.cpp	(.../TTaskBaseData.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -23,119 +23,118 @@
 #include "TCoreException.h"
 #include "ErrorCodes.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-TTaskBaseData::TTaskBaseData() :
-	m_strTaskName(m_setChanges),
-	m_eCurrentState(m_setChanges),
-	m_pathLog(m_setChanges),
-	m_pathDestinationPath(m_setChanges)
+namespace chcore
 {
-	m_setChanges[eMod_Added] = true;
-}
+	TTaskBaseData::TTaskBaseData() :
+		m_strTaskName(m_setChanges),
+		m_eCurrentState(m_setChanges),
+		m_pathLog(m_setChanges),
+		m_pathDestinationPath(m_setChanges)
+	{
+		m_setChanges[eMod_Added] = true;
+	}
 
-TTaskBaseData::~TTaskBaseData()
-{
-}
+	TTaskBaseData::~TTaskBaseData()
+	{
+	}
 
-TString TTaskBaseData::GetTaskName() const
-{
-	return m_strTaskName;
-}
+	TString TTaskBaseData::GetTaskName() const
+	{
+		return m_strTaskName;
+	}
 
-void TTaskBaseData::SetTaskName(const TString& strTaskName)
-{
-	m_strTaskName = strTaskName;
-}
+	void TTaskBaseData::SetTaskName(const TString& strTaskName)
+	{
+		m_strTaskName = strTaskName;
+	}
 
-ETaskCurrentState TTaskBaseData::GetCurrentState() const
-{
-	return m_eCurrentState;
-}
+	ETaskCurrentState TTaskBaseData::GetCurrentState() const
+	{
+		return m_eCurrentState;
+	}
 
-void TTaskBaseData::SetCurrentState(ETaskCurrentState eCurrentState)
-{
-	m_eCurrentState = eCurrentState;
-}
+	void TTaskBaseData::SetCurrentState(ETaskCurrentState eCurrentState)
+	{
+		m_eCurrentState = eCurrentState;
+	}
 
-TSmartPath TTaskBaseData::GetLogPath() const
-{
-	return m_pathLog;
-}
+	TSmartPath TTaskBaseData::GetLogPath() const
+	{
+		return m_pathLog;
+	}
 
-void TTaskBaseData::SetLogPath(const TSmartPath& pathLog)
-{
-	m_pathLog = pathLog;
-}
+	void TTaskBaseData::SetLogPath(const TSmartPath& pathLog)
+	{
+		m_pathLog = pathLog;
+	}
 
-TSmartPath TTaskBaseData::GetDestinationPath() const
-{
-	return m_pathDestinationPath;
-}
+	TSmartPath TTaskBaseData::GetDestinationPath() const
+	{
+		return m_pathDestinationPath;
+	}
 
-void TTaskBaseData::SetDestinationPath(const TSmartPath& pathDst)
-{
-	m_pathDestinationPath = pathDst;
-}
+	void TTaskBaseData::SetDestinationPath(const TSmartPath& pathDst)
+	{
+		m_pathDestinationPath = pathDst;
+	}
 
-void TTaskBaseData::Store(const ISerializerContainerPtr& spContainer) const
-{
-	InitColumns(spContainer);
-
-	// base data
-	if(m_setChanges.any())
+	void TTaskBaseData::Store(const ISerializerContainerPtr& spContainer) const
 	{
-		bool bAdded = m_setChanges[eMod_Added];
+		InitColumns(spContainer);
 
-		ISerializerRowData& rRow = spContainer->GetRow(0, bAdded);
+		// base data
+		if (m_setChanges.any())
+		{
+			bool bAdded = m_setChanges[eMod_Added];
 
-		if(bAdded || m_setChanges[eMod_TaskName])
-			rRow.SetValue(_T("name"), m_strTaskName);
+			ISerializerRowData& rRow = spContainer->GetRow(0, bAdded);
 
-		if(bAdded || m_setChanges[eMod_LogPath])
-			rRow.SetValue(_T("log_path"), m_pathLog);
+			if (bAdded || m_setChanges[eMod_TaskName])
+				rRow.SetValue(_T("name"), m_strTaskName);
 
-		if(bAdded || m_setChanges[eMod_CurrentState])
-			rRow.SetValue(_T("current_state"), m_eCurrentState);
+			if (bAdded || m_setChanges[eMod_LogPath])
+				rRow.SetValue(_T("log_path"), m_pathLog);
 
-		if(bAdded || m_setChanges[eMod_DstPath])
-			rRow.SetValue(_T("destination_path"), m_pathDestinationPath);
+			if (bAdded || m_setChanges[eMod_CurrentState])
+				rRow.SetValue(_T("current_state"), m_eCurrentState);
 
-		m_setChanges.reset();
+			if (bAdded || m_setChanges[eMod_DstPath])
+				rRow.SetValue(_T("destination_path"), m_pathDestinationPath);
+
+			m_setChanges.reset();
+		}
 	}
-}
 
-void TTaskBaseData::Load(const ISerializerContainerPtr& spContainer)
-{
-	InitColumns(spContainer);
+	void TTaskBaseData::Load(const ISerializerContainerPtr& spContainer)
+	{
+		InitColumns(spContainer);
 
-	ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader();
+		ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader();
 
-	bool bResult = spRowReader->Next();
-	if(bResult)
-	{
-		spRowReader->GetValue(_T("name"), m_strTaskName.Modify());
-		spRowReader->GetValue(_T("log_path"), m_pathLog.Modify());
-		spRowReader->GetValue(_T("current_state"), *(int*)(ETaskCurrentState*)&m_eCurrentState.Modify());
-		spRowReader->GetValue(_T("destination_path"), m_pathDestinationPath.Modify());
+		bool bResult = spRowReader->Next();
+		if (bResult)
+		{
+			spRowReader->GetValue(_T("name"), m_strTaskName.Modify());
+			spRowReader->GetValue(_T("log_path"), m_pathLog.Modify());
+			spRowReader->GetValue(_T("current_state"), *(int*)(ETaskCurrentState*)&m_eCurrentState.Modify());
+			spRowReader->GetValue(_T("destination_path"), m_pathDestinationPath.Modify());
+		}
+		else
+			THROW_CORE_EXCEPTION(eErr_SerializeLoadError);
+
+		m_setChanges.reset();
 	}
-	else
-		THROW_CORE_EXCEPTION(eErr_SerializeLoadError);
 
-	m_setChanges.reset();
-}
-
-void TTaskBaseData::InitColumns(const ISerializerContainerPtr& spContainer) const
-{
-	IColumnsDefinition& rColumns = spContainer->GetColumnsDefinition();
-	if(rColumns.IsEmpty())
+	void TTaskBaseData::InitColumns(const ISerializerContainerPtr& spContainer) const
 	{
-		rColumns.AddColumn(_T("id"), ColumnType<object_id_t>::value);
-		rColumns.AddColumn(_T("name"), IColumnsDefinition::eType_string);
-		rColumns.AddColumn(_T("log_path"), IColumnsDefinition::eType_path);
-		rColumns.AddColumn(_T("current_state"), IColumnsDefinition::eType_int);
-		rColumns.AddColumn(_T("destination_path"), IColumnsDefinition::eType_path);
+		IColumnsDefinition& rColumns = spContainer->GetColumnsDefinition();
+		if (rColumns.IsEmpty())
+		{
+			rColumns.AddColumn(_T("id"), ColumnType<object_id_t>::value);
+			rColumns.AddColumn(_T("name"), IColumnsDefinition::eType_string);
+			rColumns.AddColumn(_T("log_path"), IColumnsDefinition::eType_path);
+			rColumns.AddColumn(_T("current_state"), IColumnsDefinition::eType_int);
+			rColumns.AddColumn(_T("destination_path"), IColumnsDefinition::eType_path);
+		}
 	}
 }
-
-END_CHCORE_NAMESPACE