Index: src/libchcore/TFileInfo.cpp
===================================================================
diff -u -N -r95a466ca0a4f95851dcacf2b80e2084e0168b7e4 -r27c262eb9cae55720e10f4886af6b5a82cb94fe9
--- src/libchcore/TFileInfo.cpp	(.../TFileInfo.cpp)	(revision 95a466ca0a4f95851dcacf2b80e2084e0168b7e4)
+++ src/libchcore/TFileInfo.cpp	(.../TFileInfo.cpp)	(revision 27c262eb9cae55720e10f4886af6b5a82cb94fe9)
@@ -25,303 +25,329 @@
 #include "ISerializerRowData.h"
 #include "ISerializerContainer.h"
 
-BEGIN_CHCORE_NAMESPACE
+namespace chcore
+{
+	//////////////////////////////////////////////////////////////////////
+	// Construction/Destruction
+	//////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
+	TFileInfo::TFileInfo() :
+		m_pathFile(m_setModifications),
+		m_spBasePathData(m_setModifications),
+		m_dwAttributes(m_setModifications, 0),
+		m_uhFileSize(m_setModifications, 0),
+		m_ftCreation(m_setModifications),
+		m_ftLastAccess(m_setModifications),
+		m_ftLastWrite(m_setModifications),
+		m_uiFlags(m_setModifications, 0),
+		m_oidObjectID(0)
+	{
+		m_setModifications[eMod_Added] = true;
+	}
 
-TFileInfo::TFileInfo() :
-	m_pathFile(m_setModifications),
-	m_spBasePathData(m_setModifications),
-	m_dwAttributes(m_setModifications, 0),
-	m_uhFileSize(m_setModifications, 0),
-	m_ftCreation(m_setModifications),
-	m_ftLastAccess(m_setModifications),
-	m_ftLastWrite(m_setModifications),
-	m_uiFlags(m_setModifications, 0),
-	m_oidObjectID(0)
-{
-	m_setModifications[eMod_Added] = true;
-}
+	TFileInfo::TFileInfo(const TFileInfo& rSrc) :
+		m_pathFile(m_setModifications, rSrc.m_pathFile),
+		m_spBasePathData(m_setModifications, rSrc.m_spBasePathData),
+		m_dwAttributes(m_setModifications, rSrc.m_dwAttributes),
+		m_uhFileSize(m_setModifications, rSrc.m_uhFileSize),
+		m_ftCreation(m_setModifications, rSrc.m_ftCreation),
+		m_ftLastAccess(m_setModifications, rSrc.m_ftLastAccess),
+		m_ftLastWrite(m_setModifications, rSrc.m_ftLastWrite),
+		m_uiFlags(m_setModifications, rSrc.m_uiFlags),
+		m_oidObjectID(rSrc.m_oidObjectID)
+	{
+		m_setModifications = rSrc.m_setModifications;
+	}
 
-TFileInfo::TFileInfo(const TFileInfo& rSrc) :
-	m_pathFile(m_setModifications, rSrc.m_pathFile),
-	m_spBasePathData(m_setModifications, rSrc.m_spBasePathData),
-	m_dwAttributes(m_setModifications, rSrc.m_dwAttributes),
-	m_uhFileSize(m_setModifications, rSrc.m_uhFileSize),
-	m_ftCreation(m_setModifications, rSrc.m_ftCreation),
-	m_ftLastAccess(m_setModifications, rSrc.m_ftLastAccess),
-	m_ftLastWrite(m_setModifications, rSrc.m_ftLastWrite),
-	m_uiFlags(m_setModifications, rSrc.m_uiFlags),
-	m_oidObjectID(rSrc.m_oidObjectID)
-{
-	m_setModifications = rSrc.m_setModifications;
-}
+	TFileInfo::TFileInfo(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite, uint_t uiFlags) :
+		m_pathFile(m_setModifications, rpathFile),
+		m_spBasePathData(m_setModifications, spBasePathData),
+		m_dwAttributes(m_setModifications, dwAttributes),
+		m_uhFileSize(m_setModifications, uhFileSize),
+		m_ftCreation(m_setModifications, ftCreation),
+		m_ftLastAccess(m_setModifications, ftLastAccess),
+		m_ftLastWrite(m_setModifications, ftLastWrite),
+		m_uiFlags(m_setModifications, uiFlags),
+		m_oidObjectID(0)
+	{
+		if (m_spBasePathData.Get())
+			m_pathFile.Modify().MakeRelativePath(m_spBasePathData.Get()->GetSrcPath());
+	}
 
-TFileInfo::~TFileInfo()
-{
-}
+	TFileInfo::~TFileInfo()
+	{
+	}
 
-TFileInfo& TFileInfo::operator=(const TFileInfo& rSrc)
-{
-	if(this != & rSrc)
+	TFileInfo& TFileInfo::operator=(const TFileInfo& rSrc)
 	{
-		m_pathFile = rSrc.m_pathFile;
-		m_spBasePathData = rSrc.m_spBasePathData;
-		m_dwAttributes = rSrc.m_dwAttributes;
-		m_uhFileSize = rSrc.m_uhFileSize;
-		m_ftCreation = rSrc.m_ftCreation;
-		m_ftLastAccess = rSrc.m_ftLastAccess;
-		m_ftLastWrite = rSrc.m_ftLastWrite;
-		m_uiFlags = rSrc.m_uiFlags;
-		m_oidObjectID = rSrc.m_oidObjectID;
-		m_setModifications = rSrc.m_setModifications;
+		if (this != &rSrc)
+		{
+			m_pathFile = rSrc.m_pathFile;
+			m_spBasePathData = rSrc.m_spBasePathData;
+			m_dwAttributes = rSrc.m_dwAttributes;
+			m_uhFileSize = rSrc.m_uhFileSize;
+			m_ftCreation = rSrc.m_ftCreation;
+			m_ftLastAccess = rSrc.m_ftLastAccess;
+			m_ftLastWrite = rSrc.m_ftLastWrite;
+			m_uiFlags = rSrc.m_uiFlags;
+			m_oidObjectID = rSrc.m_oidObjectID;
+			m_setModifications = rSrc.m_setModifications;
+		}
+
+		return *this;
 	}
 
-	return *this;
-}
+	void TFileInfo::Init(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile,
+		DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
+		uint_t uiFlags)
+	{
+		m_pathFile = rpathFile;
+		m_spBasePathData = spBasePathData;
+		m_dwAttributes = dwAttributes;
+		m_uhFileSize = uhFileSize;
+		m_ftCreation = ftCreation;
+		m_ftLastAccess = ftLastAccess;
+		m_ftLastWrite = ftLastWrite;
+		m_uiFlags = uiFlags;
 
-void TFileInfo::Init(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile,
-					DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
-					uint_t uiFlags)
-{
-	m_pathFile = rpathFile;
-	m_spBasePathData = spBasePathData;
-	m_dwAttributes = dwAttributes;
-	m_uhFileSize = uhFileSize;
-	m_ftCreation = ftCreation;
-	m_ftLastAccess = ftLastAccess;
-	m_ftLastWrite = ftLastWrite;
-	m_uiFlags = uiFlags;
+		if (m_spBasePathData.Get())
+			m_pathFile.Modify().MakeRelativePath(m_spBasePathData.Get()->GetSrcPath());
+	}
 
-	if(m_spBasePathData.Get())
-		m_pathFile.Modify().MakeRelativePath(m_spBasePathData.Get()->GetSrcPath());
-}
+	void TFileInfo::Init(const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
+		uint_t uiFlags)
+	{
+		m_pathFile = rpathFile;
+		m_spBasePathData.Modify().reset();
+		m_dwAttributes = dwAttributes;
+		m_uhFileSize = uhFileSize;
+		m_ftCreation = ftCreation;
+		m_ftLastAccess = ftLastAccess;
+		m_ftLastWrite = ftLastWrite;
+		m_uiFlags = uiFlags;
+	}
 
-void TFileInfo::Init(const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
-					 uint_t uiFlags)
-{
-	m_pathFile = rpathFile;
-	m_spBasePathData.Modify().reset();
-	m_dwAttributes = dwAttributes;
-	m_uhFileSize = uhFileSize;
-	m_ftCreation = ftCreation;
-	m_ftLastAccess = ftLastAccess;
-	m_ftLastWrite = ftLastWrite;
-	m_uiFlags = uiFlags;
-}
+	void TFileInfo::SetParentObject(const TBasePathDataPtr& spBasePathData)
+	{
+		// cannot set parent object if there is already one specified
+		if (m_spBasePathData.Get())
+			THROW_CORE_EXCEPTION(eErr_InvalidArgument);
 
-void TFileInfo::SetParentObject(const TBasePathDataPtr& spBasePathData)
-{
-	// cannot set parent object if there is already one specified
-	if(m_spBasePathData.Get())
-		THROW_CORE_EXCEPTION(eErr_InvalidArgument);
+		m_spBasePathData = spBasePathData;
+		if (m_spBasePathData.Get())
+			m_pathFile.Modify().MakeRelativePath(m_spBasePathData.Get()->GetSrcPath());
+	}
 
-	m_spBasePathData = spBasePathData;
-	if(m_spBasePathData.Get())
-		m_pathFile.Modify().MakeRelativePath(m_spBasePathData.Get()->GetSrcPath());
-}
+	bool TFileInfo::operator==(const TFileInfo& rInfo) const
+	{
+		return (rInfo.m_dwAttributes == m_dwAttributes &&
+			rInfo.m_ftCreation.Get() == m_ftCreation.Get() &&
+			rInfo.m_ftLastWrite.Get() == m_ftLastWrite.Get() &&
+			rInfo.m_uhFileSize == m_uhFileSize);
+	}
 
-bool TFileInfo::operator==(const TFileInfo& rInfo) const
-{
-	return (rInfo.m_dwAttributes == m_dwAttributes &&
-		rInfo.m_ftCreation.Get() == m_ftCreation.Get() &&
-		rInfo.m_ftLastWrite.Get() == m_ftLastWrite.Get() &&
-		rInfo.m_uhFileSize == m_uhFileSize);
-}
+	TSmartPath TFileInfo::GetFullFilePath() const
+	{
+		if (m_spBasePathData.Get())
+		{
+			TSmartPath pathCombined = m_spBasePathData.Get()->GetSrcPath();
+			pathCombined += m_pathFile;
+			return pathCombined;
+		}
+		else
+			return m_pathFile;
+	}
 
-TSmartPath TFileInfo::GetFullFilePath() const
-{
-	if(m_spBasePathData.Get())
+	object_id_t TFileInfo::GetSrcObjectID() const
 	{
-		TSmartPath pathCombined = m_spBasePathData.Get()->GetSrcPath();
-		pathCombined += m_pathFile;
-		return pathCombined;
+		if (m_spBasePathData.Get())
+			return m_spBasePathData.Get()->GetObjectID();
+		return (object_id_t)-1;
 	}
-	else
-		return m_pathFile;
-}
 
-object_id_t TFileInfo::GetSrcObjectID() const
-{
-	if(m_spBasePathData.Get())
-		return m_spBasePathData.Get()->GetObjectID();
-	return (object_id_t)-1;
-}
+	TBasePathDataPtr TFileInfo::GetBasePathData() const
+	{
+		return m_spBasePathData;
+	}
 
-TBasePathDataPtr TFileInfo::GetBasePathData() const
-{
-	return m_spBasePathData;
-}
+	void TFileInfo::MarkAsProcessed(bool bProcessed)
+	{
+		if (bProcessed)
+			m_uiFlags.Modify() |= eFlag_Processed;
+		else
+			m_uiFlags.Modify() &= ~eFlag_Processed;
+	}
 
-void TFileInfo::MarkAsProcessed(bool bProcessed)
-{
-	if(bProcessed)
-		m_uiFlags.Modify() |= eFlag_Processed;
-	else
-		m_uiFlags.Modify() &= ~eFlag_Processed;
-}
+	bool TFileInfo::IsProcessed() const
+	{
+		return m_uiFlags & eFlag_Processed;
+	}
 
-bool TFileInfo::IsProcessed() const
-{
-	return m_uiFlags & eFlag_Processed;
-}
+	ULONGLONG TFileInfo::GetLength64() const
+	{
+		return m_uhFileSize;
+	}
 
-ULONGLONG TFileInfo::GetLength64() const
-{
-	return m_uhFileSize;
-}
+	void TFileInfo::SetLength64(ULONGLONG uhSize)
+	{
+		m_uhFileSize = uhSize;
+	}
 
-void TFileInfo::SetLength64(ULONGLONG uhSize)
-{
-	m_uhFileSize=uhSize;
-}
+	void TFileInfo::SetFileTimes(const TFileTime& rCreation, const TFileTime& rLastAccess, const TFileTime& rLastWrite)
+	{
+		m_ftCreation = rCreation;
+		m_ftLastAccess = rLastAccess;
+		m_ftLastWrite = rLastWrite;
+	}
 
-const TSmartPath& TFileInfo::GetFilePath() const
-{
-	return m_pathFile;
-}
+	const TSmartPath& TFileInfo::GetFilePath() const
+	{
+		return m_pathFile;
+	}
 
-void TFileInfo::SetFilePath(const TSmartPath& tPath)
-{
-	m_pathFile = tPath;
-}
+	void TFileInfo::SetFilePath(const TSmartPath& tPath)
+	{
+		m_pathFile = tPath;
+	}
 
-const TFileTime& TFileInfo::GetCreationTime() const
-{
-	return m_ftCreation;
-}
+	const TFileTime& TFileInfo::GetCreationTime() const
+	{
+		return m_ftCreation;
+	}
 
-const TFileTime& TFileInfo::GetLastAccessTime() const
-{
-	return m_ftLastAccess;
-}
+	const TFileTime& TFileInfo::GetLastAccessTime() const
+	{
+		return m_ftLastAccess;
+	}
 
-const TFileTime& TFileInfo::GetLastWriteTime() const
-{
-	return m_ftLastWrite;
-}
+	const TFileTime& TFileInfo::GetLastWriteTime() const
+	{
+		return m_ftLastWrite;
+	}
 
-DWORD TFileInfo::GetAttributes() const
-{
-	return m_dwAttributes;
-}
+	DWORD TFileInfo::GetAttributes() const
+	{
+		return m_dwAttributes;
+	}
 
-bool TFileInfo::IsDirectory() const
-{
-	return (m_dwAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-}
+	void TFileInfo::SetAttributes(DWORD dwAttributes)
+	{
+		m_dwAttributes = dwAttributes;
+	}
 
-bool TFileInfo::IsArchived() const
-{
-	return (m_dwAttributes & FILE_ATTRIBUTE_ARCHIVE) != 0;
-}
+	bool TFileInfo::IsDirectory() const
+	{
+		return (m_dwAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
+	}
 
-bool TFileInfo::IsReadOnly() const
-{
-	return (m_dwAttributes & FILE_ATTRIBUTE_READONLY) != 0;
-}
+	bool TFileInfo::IsArchived() const
+	{
+		return (m_dwAttributes & FILE_ATTRIBUTE_ARCHIVE) != 0;
+	}
 
-bool TFileInfo::IsCompressed() const
-{
-	return (m_dwAttributes & FILE_ATTRIBUTE_COMPRESSED) != 0;
-}
+	bool TFileInfo::IsReadOnly() const
+	{
+		return (m_dwAttributes & FILE_ATTRIBUTE_READONLY) != 0;
+	}
 
-bool TFileInfo::IsSystem() const
-{
-	return (m_dwAttributes & FILE_ATTRIBUTE_SYSTEM) != 0;
-}
+	bool TFileInfo::IsCompressed() const
+	{
+		return (m_dwAttributes & FILE_ATTRIBUTE_COMPRESSED) != 0;
+	}
 
-bool TFileInfo::IsHidden() const
-{
-	return (m_dwAttributes & FILE_ATTRIBUTE_HIDDEN) != 0;
-}
+	bool TFileInfo::IsSystem() const
+	{
+		return (m_dwAttributes & FILE_ATTRIBUTE_SYSTEM) != 0;
+	}
 
-bool TFileInfo::IsTemporary() const
-{
-	return (m_dwAttributes & FILE_ATTRIBUTE_TEMPORARY) != 0;
-}
+	bool TFileInfo::IsHidden() const
+	{
+		return (m_dwAttributes & FILE_ATTRIBUTE_HIDDEN) != 0;
+	}
 
-bool TFileInfo::IsNormal() const
-{
-	return m_dwAttributes == 0;
-}
+	bool TFileInfo::IsTemporary() const
+	{
+		return (m_dwAttributes & FILE_ATTRIBUTE_TEMPORARY) != 0;
+	}
 
-void TFileInfo::Store(const ISerializerContainerPtr& spContainer) const
-{
-	if(m_setModifications.any())
+	bool TFileInfo::IsNormal() const
 	{
-		ISerializerRowData& rRow = spContainer->GetRow(m_oidObjectID, m_setModifications[eMod_Added]);
+		return m_dwAttributes == 0;
+	}
 
-		if(m_setModifications[eMod_Path])
-			rRow.SetValue(_T("rel_path"), m_pathFile);
-		if(m_setModifications[eMod_BasePath])
-			rRow.SetValue(_T("base_path_id"), m_spBasePathData.Get()->GetObjectID());
-		if(m_setModifications[eMod_Attributes])
-			rRow.SetValue(_T("attr"), m_dwAttributes);
-		if(m_setModifications[eMod_FileSize])
-			rRow.SetValue(_T("size"), m_uhFileSize);
-		if(m_setModifications[eMod_TimeCreated])
-			rRow.SetValue(_T("time_created"), m_ftCreation.Get().ToUInt64());
-		if(m_setModifications[eMod_TimeLastWrite])
-			rRow.SetValue(_T("time_last_write"), m_ftLastWrite.Get().ToUInt64());
-		if(m_setModifications[eMod_TimeLastAccess])
-			rRow.SetValue(_T("time_last_access"), m_ftLastAccess.Get().ToUInt64());
-		if(m_setModifications[eMod_Flags])
-			rRow.SetValue(_T("flags"), m_uiFlags);
+	void TFileInfo::Store(const ISerializerContainerPtr& spContainer) const
+	{
+		if (m_setModifications.any())
+		{
+			ISerializerRowData& rRow = spContainer->GetRow(m_oidObjectID, m_setModifications[eMod_Added]);
 
-		m_setModifications.reset();
+			if (m_setModifications[eMod_Path])
+				rRow.SetValue(_T("rel_path"), m_pathFile);
+			if (m_setModifications[eMod_BasePath])
+				rRow.SetValue(_T("base_path_id"), m_spBasePathData.Get()->GetObjectID());
+			if (m_setModifications[eMod_Attributes])
+				rRow.SetValue(_T("attr"), m_dwAttributes);
+			if (m_setModifications[eMod_FileSize])
+				rRow.SetValue(_T("size"), m_uhFileSize);
+			if (m_setModifications[eMod_TimeCreated])
+				rRow.SetValue(_T("time_created"), m_ftCreation.Get().ToUInt64());
+			if (m_setModifications[eMod_TimeLastWrite])
+				rRow.SetValue(_T("time_last_write"), m_ftLastWrite.Get().ToUInt64());
+			if (m_setModifications[eMod_TimeLastAccess])
+				rRow.SetValue(_T("time_last_access"), m_ftLastAccess.Get().ToUInt64());
+			if (m_setModifications[eMod_Flags])
+				rRow.SetValue(_T("flags"), m_uiFlags);
+
+			m_setModifications.reset();
+		}
 	}
-}
 
-void TFileInfo::InitColumns(IColumnsDefinition& rColumns)
-{
-	rColumns.AddColumn(_T("id"), ColumnType<object_id_t>::value);
-	rColumns.AddColumn(_T("rel_path"), IColumnsDefinition::eType_path);
-	rColumns.AddColumn(_T("base_path_id"), ColumnType<object_id_t>::value);
-	rColumns.AddColumn(_T("attr"), IColumnsDefinition::eType_ulong);
-	rColumns.AddColumn(_T("size"), IColumnsDefinition::eType_ulonglong);
-	rColumns.AddColumn(_T("time_created"), IColumnsDefinition::eType_ulonglong);
-	rColumns.AddColumn(_T("time_last_write"), IColumnsDefinition::eType_ulonglong);
-	rColumns.AddColumn(_T("time_last_access"), IColumnsDefinition::eType_ulonglong);
-	rColumns.AddColumn(_T("flags"), IColumnsDefinition::eType_uint);
-}
+	void TFileInfo::InitColumns(IColumnsDefinition& rColumns)
+	{
+		rColumns.AddColumn(_T("id"), ColumnType<object_id_t>::value);
+		rColumns.AddColumn(_T("rel_path"), IColumnsDefinition::eType_path);
+		rColumns.AddColumn(_T("base_path_id"), ColumnType<object_id_t>::value);
+		rColumns.AddColumn(_T("attr"), IColumnsDefinition::eType_ulong);
+		rColumns.AddColumn(_T("size"), IColumnsDefinition::eType_ulonglong);
+		rColumns.AddColumn(_T("time_created"), IColumnsDefinition::eType_ulonglong);
+		rColumns.AddColumn(_T("time_last_write"), IColumnsDefinition::eType_ulonglong);
+		rColumns.AddColumn(_T("time_last_access"), IColumnsDefinition::eType_ulonglong);
+		rColumns.AddColumn(_T("flags"), IColumnsDefinition::eType_uint);
+	}
 
-void TFileInfo::Load(const ISerializerRowReaderPtr& spRowReader, const TBasePathDataContainerPtr& spSrcContainer)
-{
-	size_t stBaseObjectID = 0;
-	unsigned long long ullTime = 0;
-	spRowReader->GetValue(_T("id"), m_oidObjectID);
-	spRowReader->GetValue(_T("rel_path"), m_pathFile.Modify());
-	spRowReader->GetValue(_T("base_path_id"), stBaseObjectID);
-	spRowReader->GetValue(_T("attr"), m_dwAttributes.Modify());
-	spRowReader->GetValue(_T("size"), m_uhFileSize.Modify());
+	void TFileInfo::Load(const ISerializerRowReaderPtr& spRowReader, const TBasePathDataContainerPtr& spSrcContainer)
+	{
+		size_t stBaseObjectID = 0;
+		unsigned long long ullTime = 0;
+		spRowReader->GetValue(_T("id"), m_oidObjectID);
+		spRowReader->GetValue(_T("rel_path"), m_pathFile.Modify());
+		spRowReader->GetValue(_T("base_path_id"), stBaseObjectID);
+		spRowReader->GetValue(_T("attr"), m_dwAttributes.Modify());
+		spRowReader->GetValue(_T("size"), m_uhFileSize.Modify());
 
-	spRowReader->GetValue(_T("time_created"), ullTime);
-	m_ftCreation.Modify().FromUInt64(ullTime);
+		spRowReader->GetValue(_T("time_created"), ullTime);
+		m_ftCreation.Modify().FromUInt64(ullTime);
 
-	spRowReader->GetValue(_T("time_last_write"), ullTime);
-	m_ftLastWrite.Modify().FromUInt64(ullTime);
+		spRowReader->GetValue(_T("time_last_write"), ullTime);
+		m_ftLastWrite.Modify().FromUInt64(ullTime);
 
-	spRowReader->GetValue(_T("time_last_access"), ullTime);
-	m_ftLastAccess.Modify().FromUInt64(ullTime);
+		spRowReader->GetValue(_T("time_last_access"), ullTime);
+		m_ftLastAccess.Modify().FromUInt64(ullTime);
 
-	spRowReader->GetValue(_T("flags"), m_uiFlags.Modify());
+		spRowReader->GetValue(_T("flags"), m_uiFlags.Modify());
 
-	m_spBasePathData = spSrcContainer->FindByID(stBaseObjectID);
+		m_spBasePathData = spSrcContainer->FindByID(stBaseObjectID);
 
-	m_setModifications.reset();
-}
+		m_setModifications.reset();
+	}
 
-object_id_t TFileInfo::GetObjectID() const
-{
-	return m_oidObjectID;
-}
+	object_id_t TFileInfo::GetObjectID() const
+	{
+		return m_oidObjectID;
+	}
 
-void TFileInfo::SetObjectID(object_id_t oidObjectID)
-{
-	m_oidObjectID = oidObjectID;
+	void TFileInfo::SetObjectID(object_id_t oidObjectID)
+	{
+		m_oidObjectID = oidObjectID;
+	}
 }
-
-END_CHCORE_NAMESPACE