Index: src/libchcore/TFileInfo.h
===================================================================
diff -u -N -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -r27c262eb9cae55720e10f4886af6b5a82cb94fe9
--- src/libchcore/TFileInfo.h	(.../TFileInfo.h)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
+++ src/libchcore/TFileInfo.h	(.../TFileInfo.h)	(revision 27c262eb9cae55720e10f4886af6b5a82cb94fe9)
@@ -29,117 +29,119 @@
 #include "TSharedModificationTracker.h"
 #include "TFileTime.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-// CFileInfo flags
-
-class LIBCHCORE_API TFileInfo
+namespace chcore
 {
-public:
-	enum EFlags
+	class LIBCHCORE_API TFileInfo
 	{
-		// flag stating that file has been processed (used to determine if file can be deleted at the end of copying)
-		eFlag_Processed = 1,
-	};
+	public:
+		enum EFlags
+		{
+			// flag stating that file has been processed (used to determine if file can be deleted at the end of copying)
+			eFlag_Processed = 1,
+		};
 
-public:
-	TFileInfo();
-	TFileInfo(const TFileInfo& rSrc);
-	~TFileInfo();
+	public:
+		TFileInfo();
+		TFileInfo(const TFileInfo& rSrc);
+		TFileInfo(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile,
+			DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
+			uint_t uiFlags);
+		~TFileInfo();
 
-	TFileInfo& operator=(const TFileInfo& rSrc);
+		TFileInfo& operator=(const TFileInfo& rSrc);
 
-	// operators
-	bool operator==(const TFileInfo& rInfo) const;
+		// operators
+		bool operator==(const TFileInfo& rInfo) const;
 
-	// with base path
-	void Init(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile,
-		DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
-		uint_t uiFlags);
+		// with base path
+		void Init(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile,
+			DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
+			uint_t uiFlags);
 
-	// without base path
-	void Init(const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation,
-		FILETIME ftLastAccess, FILETIME ftLastWrite, uint_t uiFlags);
+		// without base path
+		void Init(const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation,
+			FILETIME ftLastAccess, FILETIME ftLastWrite, uint_t uiFlags);
 
-	// unique object id
-	object_id_t GetObjectID() const;
-	void SetObjectID(object_id_t oidObjectID);
+		// unique object id
+		object_id_t GetObjectID() const;
+		void SetObjectID(object_id_t oidObjectID);
 
-	// parent object
-	TBasePathDataPtr GetBasePathData() const;
-	void SetParentObject(const TBasePathDataPtr& spBasePathData);
-	object_id_t GetSrcObjectID() const;
+		// parent object
+		TBasePathDataPtr GetBasePathData() const;
+		void SetParentObject(const TBasePathDataPtr& spBasePathData);
+		object_id_t GetSrcObjectID() const;
 
-	// file path
-	const TSmartPath& GetFilePath() const;	// returns path with m_pathFile (probably not full)
-	TSmartPath GetFullFilePath() const;		// returns full path
-	void SetFilePath(const TSmartPath& tPath);
+		// file path
+		const TSmartPath& GetFilePath() const;	// returns path with m_pathFile (probably not full)
+		TSmartPath GetFullFilePath() const;		// returns full path
+		void SetFilePath(const TSmartPath& tPath);
 
-	// file size
-	ULONGLONG GetLength64() const;
-	void SetLength64(ULONGLONG uhSize);
+		// file size
+		ULONGLONG GetLength64() const;
+		void SetLength64(ULONGLONG uhSize);
 
-	// file times
-	const TFileTime& GetCreationTime() const;
-	const TFileTime& GetLastAccessTime() const;
-	const TFileTime& GetLastWriteTime() const;
+		// file times
+		void SetFileTimes(const TFileTime& rCreation, const TFileTime& rLastAccess, const TFileTime& rLastWrite);
+		const TFileTime& GetCreationTime() const;
+		const TFileTime& GetLastAccessTime() const;
+		const TFileTime& GetLastWriteTime() const;
 
-	// attributes
-	DWORD GetAttributes() const;
-	bool IsDirectory() const;
-	bool IsArchived() const;
-	bool IsReadOnly() const;
-	bool IsCompressed() const;
-	bool IsSystem() const;
-	bool IsHidden() const;
-	bool IsTemporary() const;
-	bool IsNormal() const;
+		// attributes
+		DWORD GetAttributes() const;
+		void SetAttributes(DWORD dwAttributes);
+		bool IsDirectory() const;
+		bool IsArchived() const;
+		bool IsReadOnly() const;
+		bool IsCompressed() const;
+		bool IsSystem() const;
+		bool IsHidden() const;
+		bool IsTemporary() const;
+		bool IsNormal() const;
 
-	void MarkAsProcessed(bool bProcessed);
-	bool IsProcessed() const;
+		void MarkAsProcessed(bool bProcessed);
+		bool IsProcessed() const;
 
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	static void InitColumns(IColumnsDefinition& rColumns);
-	void Load(const ISerializerRowReaderPtr& spRowReader, const TBasePathDataContainerPtr& spSrcContainer);
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		static void InitColumns(IColumnsDefinition& rColumns);
+		void Load(const ISerializerRowReaderPtr& spRowReader, const TBasePathDataContainerPtr& spSrcContainer);
 
-private:
-	enum EModifications
-	{
-		eMod_None = 0,
-		eMod_Added,
-		eMod_Path,
-		eMod_BasePath,
-		eMod_Attributes,
-		eMod_FileSize,
-		eMod_TimeCreated,
-		eMod_TimeLastAccess,
-		eMod_TimeLastWrite,
-		eMod_Flags,
+	private:
+		enum EModifications
+		{
+			eMod_None = 0,
+			eMod_Added,
+			eMod_Path,
+			eMod_BasePath,
+			eMod_Attributes,
+			eMod_FileSize,
+			eMod_TimeCreated,
+			eMod_TimeLastAccess,
+			eMod_TimeLastWrite,
+			eMod_Flags,
 
-		// do not use - must be the last value in this enum
-		eMod_Last
-	};
+			// do not use - must be the last value in this enum
+			eMod_Last
+		};
 
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	typedef std::bitset<eMod_Last> Bitset;
-	mutable Bitset m_setModifications;
+		typedef std::bitset<eMod_Last> Bitset;
+		mutable Bitset m_setModifications;
 
-	object_id_t m_oidObjectID;
+		object_id_t m_oidObjectID;
 
-	TSharedModificationTracker<TSmartPath, Bitset, eMod_Path> m_pathFile;
-	TSharedModificationTracker<TBasePathDataPtr, Bitset, eMod_BasePath> m_spBasePathData;
-	TSharedModificationTracker<DWORD, Bitset, eMod_Attributes> m_dwAttributes;	// attributes
-	TSharedModificationTracker<ULONGLONG, Bitset, eMod_FileSize> m_uhFileSize;
-	TSharedModificationTracker<TFileTime, Bitset, eMod_TimeCreated> m_ftCreation;
-	TSharedModificationTracker<TFileTime, Bitset, eMod_TimeLastAccess> m_ftLastAccess;
-	TSharedModificationTracker<TFileTime, Bitset, eMod_TimeLastWrite> m_ftLastWrite;
-	TSharedModificationTracker<uint_t, Bitset, eMod_Flags> m_uiFlags;
+		TSharedModificationTracker<TSmartPath, Bitset, eMod_Path> m_pathFile;
+		TSharedModificationTracker<TBasePathDataPtr, Bitset, eMod_BasePath> m_spBasePathData;
+		TSharedModificationTracker<DWORD, Bitset, eMod_Attributes> m_dwAttributes;	// attributes
+		TSharedModificationTracker<ULONGLONG, Bitset, eMod_FileSize> m_uhFileSize;
+		TSharedModificationTracker<TFileTime, Bitset, eMod_TimeCreated> m_ftCreation;
+		TSharedModificationTracker<TFileTime, Bitset, eMod_TimeLastAccess> m_ftLastAccess;
+		TSharedModificationTracker<TFileTime, Bitset, eMod_TimeLastWrite> m_ftLastWrite;
+		TSharedModificationTracker<uint_t, Bitset, eMod_Flags> m_uiFlags;
 #pragma warning(pop)
-};
+	};
 
-typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+	typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+}
 
-END_CHCORE_NAMESPACE
-
 #endif