Index: src/libchcore/TTaskDefinition.cpp
===================================================================
diff -u -N -r31cbdfa4bdbab86ce7c143b6899395454e158293 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TTaskDefinition.cpp	(.../TTaskDefinition.cpp)	(revision 31cbdfa4bdbab86ce7c143b6899395454e158293)
+++ src/libchcore/TTaskDefinition.cpp	(.../TTaskDefinition.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -32,270 +32,269 @@
 
 #define CURRENT_TASK_VERSION 1
 
-BEGIN_CHCORE_NAMESPACE
-
-TTaskDefinition::TTaskDefinition() :
-	m_bModified(false),
-	m_strTaskName(),
-	m_ullTaskVersion(CURRENT_TASK_VERSION)
+namespace chcore
 {
-	boost::uuids::random_generator gen;
-	boost::uuids::uuid u = gen();
-	m_strTaskName = boost::lexical_cast<std::wstring>(u).c_str();
-}
+	TTaskDefinition::TTaskDefinition() :
+		m_bModified(false),
+		m_strTaskName(),
+		m_ullTaskVersion(CURRENT_TASK_VERSION)
+	{
+		boost::uuids::random_generator gen;
+		boost::uuids::uuid u = gen();
+		m_strTaskName = boost::lexical_cast<std::wstring>(u).c_str();
+	}
 
-TTaskDefinition::TTaskDefinition(const TTaskDefinition& rSrc) :
-	m_strTaskName(rSrc.m_strTaskName),
-	m_vSourcePaths(rSrc.m_vSourcePaths),
-	m_afFilters(rSrc.m_afFilters),
-	m_pathDestinationPath(rSrc.m_pathDestinationPath),
-	m_tOperationPlan(rSrc.m_tOperationPlan),
-	m_ullTaskVersion(rSrc.m_ullTaskVersion),
-	m_tConfiguration(rSrc.m_tConfiguration),
-	m_bModified(rSrc.m_bModified)
-{
-}
+	TTaskDefinition::TTaskDefinition(const TTaskDefinition& rSrc) :
+		m_strTaskName(rSrc.m_strTaskName),
+		m_vSourcePaths(rSrc.m_vSourcePaths),
+		m_afFilters(rSrc.m_afFilters),
+		m_pathDestinationPath(rSrc.m_pathDestinationPath),
+		m_tOperationPlan(rSrc.m_tOperationPlan),
+		m_ullTaskVersion(rSrc.m_ullTaskVersion),
+		m_tConfiguration(rSrc.m_tConfiguration),
+		m_bModified(rSrc.m_bModified)
+	{
+	}
 
-TTaskDefinition::~TTaskDefinition()
-{
-}
+	TTaskDefinition::~TTaskDefinition()
+	{
+	}
 
-TTaskDefinition& TTaskDefinition::operator=(const TTaskDefinition& rSrc)
-{
-	if(this != &rSrc)
+	TTaskDefinition& TTaskDefinition::operator=(const TTaskDefinition& rSrc)
 	{
-		m_strTaskName = rSrc.m_strTaskName;
-		m_vSourcePaths = rSrc.m_vSourcePaths;
-		m_afFilters = rSrc.m_afFilters;
-		m_pathDestinationPath = rSrc.m_pathDestinationPath;
-		m_tOperationPlan = rSrc.m_tOperationPlan;
-		m_ullTaskVersion = rSrc.m_ullTaskVersion;
-		m_tConfiguration = rSrc.m_tConfiguration;
-		m_bModified = rSrc.m_bModified;
+		if (this != &rSrc)
+		{
+			m_strTaskName = rSrc.m_strTaskName;
+			m_vSourcePaths = rSrc.m_vSourcePaths;
+			m_afFilters = rSrc.m_afFilters;
+			m_pathDestinationPath = rSrc.m_pathDestinationPath;
+			m_tOperationPlan = rSrc.m_tOperationPlan;
+			m_ullTaskVersion = rSrc.m_ullTaskVersion;
+			m_tConfiguration = rSrc.m_tConfiguration;
+			m_bModified = rSrc.m_bModified;
+		}
+
+		return *this;
 	}
 
-	return *this;
-}
+	// Task unique id
+	TString TTaskDefinition::GetTaskName() const
+	{
+		return m_strTaskName;
+	}
 
-// Task unique id
-TString TTaskDefinition::GetTaskName() const
-{
-	return m_strTaskName;
-}
+	// Source paths
+	// initialize object with data (get/set, from cfg file?, from string(cmd line options))
+	void TTaskDefinition::AddSourcePath(const TSmartPath& tPath)
+	{
+		m_vSourcePaths.Add(tPath);
+		m_bModified = true;
+	}
 
-// Source paths
-// initialize object with data (get/set, from cfg file?, from string(cmd line options))
-void TTaskDefinition::AddSourcePath(const TSmartPath& tPath)
-{
-	m_vSourcePaths.Add(tPath);
-	m_bModified = true;
-}
+	TSmartPath TTaskDefinition::GetSourcePathAt(size_t stIndex) const
+	{
+		return m_vSourcePaths.GetAt(stIndex);
+	}
 
-TSmartPath TTaskDefinition::GetSourcePathAt(size_t stIndex) const
-{
-	return m_vSourcePaths.GetAt(stIndex);
-}
+	size_t TTaskDefinition::GetSourcePathCount() const
+	{
+		return m_vSourcePaths.GetCount();
+	}
 
-size_t TTaskDefinition::GetSourcePathCount() const
-{
-	return m_vSourcePaths.GetCount();
-}
+	void TTaskDefinition::ClearSourcePaths()
+	{
+		m_vSourcePaths.Clear();
+		m_bModified = true;
+	}
 
-void TTaskDefinition::ClearSourcePaths()
-{
-	m_vSourcePaths.Clear();
-	m_bModified = true;
-}
+	void TTaskDefinition::SetSourcePaths(const TPathContainer& rvPaths)
+	{
+		m_vSourcePaths = rvPaths;
+	}
 
-void TTaskDefinition::SetSourcePaths(const TPathContainer& rvPaths)
-{
-	m_vSourcePaths = rvPaths;
-}
+	const TPathContainer& TTaskDefinition::GetSourcePaths() const
+	{
+		return m_vSourcePaths;
+	}
 
-const TPathContainer& TTaskDefinition::GetSourcePaths() const
-{
-	return m_vSourcePaths;
-}
+	// Destination path
+	void TTaskDefinition::SetDestinationPath(const TSmartPath& pathDestination)
+	{
+		m_pathDestinationPath = pathDestination;
+		if (!m_pathDestinationPath.IsEmpty())
+			m_pathDestinationPath.AppendSeparatorIfDoesNotExist();
+		m_bModified = true;
+	}
 
-// Destination path
-void TTaskDefinition::SetDestinationPath(const TSmartPath& pathDestination)
-{
-	m_pathDestinationPath = pathDestination;
-	if(!m_pathDestinationPath.IsEmpty())
-		m_pathDestinationPath.AppendSeparatorIfDoesNotExist();
-	m_bModified = true;
-}
+	TSmartPath TTaskDefinition::GetDestinationPath() const
+	{
+		return m_pathDestinationPath;
+	}
 
-TSmartPath TTaskDefinition::GetDestinationPath() const
-{
-	return m_pathDestinationPath;
-}
+	// Operation type
+	void TTaskDefinition::SetOperationType(EOperationType eOperation)
+	{
+		m_tOperationPlan.SetOperationType(eOperation);
+		m_bModified = true;
+	}
 
-// Operation type
-void TTaskDefinition::SetOperationType(EOperationType eOperation)
-{
-	m_tOperationPlan.SetOperationType(eOperation);
-	m_bModified = true;
-}
+	EOperationType TTaskDefinition::GetOperationType() const
+	{
+		return m_tOperationPlan.GetOperationType();
+	}
 
-EOperationType TTaskDefinition::GetOperationType() const
-{
-	return m_tOperationPlan.GetOperationType();
-}
+	const TOperationPlan& TTaskDefinition::GetOperationPlan() const
+	{
+		return m_tOperationPlan;
+	}
 
-const TOperationPlan& TTaskDefinition::GetOperationPlan() const
-{
-	return m_tOperationPlan;
-}
+	// Task configuration
+	void TTaskDefinition::SetConfiguration(const TConfig& rConfig)
+	{
+		m_tConfiguration = rConfig;
+		m_bModified = true;
+	}
 
-// Task configuration
-void TTaskDefinition::SetConfiguration(const TConfig& rConfig)
-{
-	m_tConfiguration = rConfig;
-	m_bModified = true;
-}
+	TConfig& TTaskDefinition::GetConfiguration()
+	{
+		return m_tConfiguration;
+	}
 
-TConfig& TTaskDefinition::GetConfiguration()
-{
-	return m_tConfiguration;
-}
+	const TConfig& TTaskDefinition::GetConfiguration() const
+	{
+		return m_tConfiguration;
+	}
 
-const TConfig& TTaskDefinition::GetConfiguration() const
-{
-	return m_tConfiguration;
-}
+	// Serialization
+	void TTaskDefinition::Load(const TSmartPath& strPath)
+	{
+		// read everything
+		TConfig tTaskInfo;
+		tTaskInfo.Read(strPath.ToString());
 
-// Serialization
-void TTaskDefinition::Load(const TSmartPath& strPath)
-{
-	// read everything
-	TConfig tTaskInfo;
-	tTaskInfo.Read(strPath.ToString());
+		Load(tTaskInfo, false);
+	}
 
-	Load(tTaskInfo, false);
-}
+	void TTaskDefinition::Load(const TConfig& rDataSrc, bool bAllowEmptyDstPath)
+	{
+		// clear everything
+		m_strTaskName.Clear();
+		m_vSourcePaths.Clear();
+		m_pathDestinationPath.Clear();
+		m_afFilters.Clear();
 
-void TTaskDefinition::Load(const TConfig& rDataSrc, bool bAllowEmptyDstPath)
-{
-	// clear everything
-	m_strTaskName.Clear();
-	m_vSourcePaths.Clear();
-	m_pathDestinationPath.Clear();
-	m_afFilters.Clear();
+		m_tConfiguration.Clear();
 
-	m_tConfiguration.Clear();
+		m_bModified = false;
 
-	m_bModified = false;
+		// get information from config file
+		// NOTE: task unique id is not read from the config by design;
+		// by using the value, CH tried to re-use the task DB causing problems.
+		// So now, always a new identifier is generated.
+		boost::uuids::random_generator gen;
+		boost::uuids::uuid u = gen();
+		m_strTaskName = boost::lexical_cast<std::wstring>(u).c_str();
 
-	// get information from config file
-	// NOTE: task unique id is not read from the config by design;
-	// by using the value, CH tried to re-use the task DB causing problems.
-	// So now, always a new identifier is generated.
-	boost::uuids::random_generator gen;
-	boost::uuids::uuid u = gen();
-	m_strTaskName = boost::lexical_cast<std::wstring>(u).c_str();
+		// basic information
+		// source paths to be processed
+		if (!GetConfigValue(rDataSrc, _T("TaskDefinition.SourcePaths.Path"), m_vSourcePaths) || m_vSourcePaths.IsEmpty())
+			THROW_CORE_EXCEPTION(eErr_MissingXmlData);
 
-	// basic information
-	// source paths to be processed
-	if (!GetConfigValue(rDataSrc, _T("TaskDefinition.SourcePaths.Path"), m_vSourcePaths) || m_vSourcePaths.IsEmpty())
-		THROW_CORE_EXCEPTION(eErr_MissingXmlData);
+		GetConfigValue(rDataSrc, _T("TaskDefinition.Filters"), m_afFilters);
 
-	GetConfigValue(rDataSrc, _T("TaskDefinition.Filters"), m_afFilters);
+		// destination path
+		if (!GetConfigValue(rDataSrc, _T("TaskDefinition.DestinationPath"), m_pathDestinationPath) || (!bAllowEmptyDstPath && m_pathDestinationPath.IsEmpty()))
+			THROW_CORE_EXCEPTION(eErr_MissingXmlData);
 
-	// destination path
-	if (!GetConfigValue(rDataSrc, _T("TaskDefinition.DestinationPath"), m_pathDestinationPath) || (!bAllowEmptyDstPath && m_pathDestinationPath.IsEmpty()))
-		THROW_CORE_EXCEPTION(eErr_MissingXmlData);
+		// append separator only if destination path is already specified; otherwise there are problems handling chext requests with no destination path
+		if (!m_pathDestinationPath.IsEmpty())
+			m_pathDestinationPath.AppendSeparatorIfDoesNotExist();
 
-	// append separator only if destination path is already specified; otherwise there are problems handling chext requests with no destination path
-	if(!m_pathDestinationPath.IsEmpty())
-		m_pathDestinationPath.AppendSeparatorIfDoesNotExist();
+		// type of the operation
+		int iOperation = eOperation_None;
+		if (!rDataSrc.GetValue(_T("TaskDefinition.OperationType"), iOperation))
+			THROW_CORE_EXCEPTION(eErr_MissingXmlData);
 
-	// type of the operation
-	int iOperation = eOperation_None;
-	if (!rDataSrc.GetValue(_T("TaskDefinition.OperationType"), iOperation))
-		THROW_CORE_EXCEPTION(eErr_MissingXmlData);
+		m_tOperationPlan.SetOperationType((EOperationType)iOperation);
 
-	m_tOperationPlan.SetOperationType((EOperationType) iOperation);
+		// and version of the task
+		if (!GetConfigValue(rDataSrc, _T("TaskDefinition.Version"), m_ullTaskVersion))
+			THROW_CORE_EXCEPTION(eErr_MissingXmlData);
 
-	// and version of the task
-	if (!GetConfigValue(rDataSrc, _T("TaskDefinition.Version"), m_ullTaskVersion))
-		THROW_CORE_EXCEPTION(eErr_MissingXmlData);
+		if (m_ullTaskVersion < CURRENT_TASK_VERSION)
+		{
+			// migrate the task to the newer version
+			// (nothing to migrate at this point, since 1.40 is the first release with xml-based tasks).
 
-	if (m_ullTaskVersion < CURRENT_TASK_VERSION)
-	{
-		// migrate the task to the newer version
-		// (nothing to migrate at this point, since 1.40 is the first release with xml-based tasks).
+			// then mark it as a newest version task
+			m_ullTaskVersion = CURRENT_TASK_VERSION;
+			m_bModified = true;
+		}
+		else if (m_ullTaskVersion > CURRENT_TASK_VERSION)
+			THROW_CORE_EXCEPTION(eErr_UnsupportedVersion);
 
-		// then mark it as a newest version task
-		m_ullTaskVersion = CURRENT_TASK_VERSION;
-		m_bModified = true;
+		rDataSrc.ExtractSubConfig(_T("TaskDefinition.TaskSettings"), m_tConfiguration);
 	}
-	else if (m_ullTaskVersion > CURRENT_TASK_VERSION)
-		THROW_CORE_EXCEPTION(eErr_UnsupportedVersion);
 
-	rDataSrc.ExtractSubConfig(_T("TaskDefinition.TaskSettings"), m_tConfiguration);
-}
+	void TTaskDefinition::LoadFromString(const TString& strInput, bool bAllowEmptyDstPath)
+	{
+		// read everything
+		TConfig tTaskInfo;
+		tTaskInfo.ReadFromString(strInput);
 
-void TTaskDefinition::LoadFromString(const TString& strInput, bool bAllowEmptyDstPath)
-{
-	// read everything
-	TConfig tTaskInfo;
-	tTaskInfo.ReadFromString(strInput);
+		Load(tTaskInfo, bAllowEmptyDstPath);
+	}
 
-	Load(tTaskInfo, bAllowEmptyDstPath);
-}
+	void TTaskDefinition::StoreInString(TString& strOutput)
+	{
+		TConfig tTaskInfo;
+		Store(tTaskInfo);
 
-void TTaskDefinition::StoreInString(TString& strOutput)
-{
-	TConfig tTaskInfo;
-	Store(tTaskInfo);
+		tTaskInfo.WriteToString(strOutput);
+	}
 
-	tTaskInfo.WriteToString(strOutput);
-}
+	void TTaskDefinition::Store(const TSmartPath& strPath) const
+	{
+		TConfig tTaskInfo;
+		Store(tTaskInfo);
 
-void TTaskDefinition::Store(const TSmartPath& strPath) const
-{
-	TConfig tTaskInfo;
-	Store(tTaskInfo);
+		tTaskInfo.SetFilePath(strPath.ToString());
+		tTaskInfo.Write();
+	}
 
-	tTaskInfo.SetFilePath(strPath.ToString());
-	tTaskInfo.Write();
-}
+	void TTaskDefinition::Store(TConfig& rConfig) const
+	{
+		// get information from config file
+		// task unique id - use if provided, generate otherwise
+		// NOTE: not storing the task ID is by design. Loading same task twice caused problems
+		// when importing and was disabled. With that, storing was no longer needed.
 
-void TTaskDefinition::Store(TConfig& rConfig) const
-{
-	// get information from config file
-	// task unique id - use if provided, generate otherwise
-	// NOTE: not storing the task ID is by design. Loading same task twice caused problems
-	// when importing and was disabled. With that, storing was no longer needed.
+		// basic information
+		SetConfigValue(rConfig, _T("TaskDefinition.SourcePaths.Path"), m_vSourcePaths);
+		SetConfigValue(rConfig, _T("TaskDefinition.Filters"), m_afFilters);
+		SetConfigValue(rConfig, _T("TaskDefinition.DestinationPath"), m_pathDestinationPath);
 
-	// basic information
-	SetConfigValue(rConfig, _T("TaskDefinition.SourcePaths.Path"), m_vSourcePaths);
-	SetConfigValue(rConfig, _T("TaskDefinition.Filters"), m_afFilters);
-	SetConfigValue(rConfig, _T("TaskDefinition.DestinationPath"), m_pathDestinationPath);
+		int iOperation = m_tOperationPlan.GetOperationType();
+		SetConfigValue(rConfig, _T("TaskDefinition.OperationType"), iOperation);
 
-	int iOperation = m_tOperationPlan.GetOperationType();
-	SetConfigValue(rConfig, _T("TaskDefinition.OperationType"), iOperation);
+		SetConfigValue(rConfig, _T("TaskDefinition.Version"), m_ullTaskVersion);
 
-	SetConfigValue(rConfig, _T("TaskDefinition.Version"), m_ullTaskVersion);
+		rConfig.PutSubConfig(_T("TaskDefinition.TaskSettings"), m_tConfiguration);
+	}
 
-	rConfig.PutSubConfig(_T("TaskDefinition.TaskSettings"), m_tConfiguration);
-}
 
+	const TFileFiltersArray& TTaskDefinition::GetFilters() const
+	{
+		return m_afFilters;
+	}
 
-const TFileFiltersArray& TTaskDefinition::GetFilters() const
-{
-	return m_afFilters;
-}
+	TFileFiltersArray& TTaskDefinition::GetFilters()
+	{
+		return m_afFilters;
+	}
 
-TFileFiltersArray& TTaskDefinition::GetFilters()
-{
-	return m_afFilters;
+	void TTaskDefinition::SetFilters(const TFileFiltersArray& rFilters)
+	{
+		m_afFilters = rFilters;
+	}
 }
-
-void TTaskDefinition::SetFilters(const TFileFiltersArray& rFilters)
-{
-	m_afFilters = rFilters;
-}
-
-END_CHCORE_NAMESPACE