Index: src/libchcore/TBasePathData.h
===================================================================
diff -u -N -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TBasePathData.h	(.../TBasePathData.h)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
+++ src/libchcore/TBasePathData.h	(.../TBasePathData.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -33,112 +33,111 @@
 #include "ISerializerRowReader.h"
 #include "CommonDataTypes.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-class TPathContainer;
-
-/////////////////////////////////////////////////////////////////////////////
-// TBasePathData
-class LIBCHCORE_API TBasePathData
+namespace chcore
 {
-private:
-	enum EModifications
+	class TPathContainer;
+
+	/////////////////////////////////////////////////////////////////////////////
+	// TBasePathData
+	class LIBCHCORE_API TBasePathData
 	{
-		eMod_Added,
-		eMod_SrcPath,
-		eMod_SkipProcessing,
-		eMod_DstPath,
+	private:
+		enum EModifications
+		{
+			eMod_Added,
+			eMod_SrcPath,
+			eMod_SkipProcessing,
+			eMod_DstPath,
 
-		eMod_Last
-	};
+			eMod_Last
+		};
 
-public:
-	TBasePathData();
-	TBasePathData(object_id_t oidObjectID, const TSmartPath& spSrcPath);
-	TBasePathData(const TBasePathData& rEntry);
+	public:
+		TBasePathData();
+		TBasePathData(object_id_t oidObjectID, const TSmartPath& spSrcPath);
+		TBasePathData(const TBasePathData& rEntry);
 
-	object_id_t GetObjectID() const;
-	void SetObjectID(object_id_t oidObjectID);
+		object_id_t GetObjectID() const;
+		void SetObjectID(object_id_t oidObjectID);
 
-	TSmartPath GetSrcPath() const;
-	void SetSrcPath(const TSmartPath& pathSrc);
+		TSmartPath GetSrcPath() const;
+		void SetSrcPath(const TSmartPath& pathSrc);
 
-	bool GetSkipFurtherProcessing() const;
-	void SetSkipFurtherProcessing(bool bSkipFurtherProcessing);
+		bool GetSkipFurtherProcessing() const;
+		void SetSkipFurtherProcessing(bool bSkipFurtherProcessing);
 
-	void SetDestinationPath(const TSmartPath& strPath);
-	TSmartPath GetDestinationPath() const;
-	bool IsDestinationPathSet() const;
+		void SetDestinationPath(const TSmartPath& strPath);
+		TSmartPath GetDestinationPath() const;
+		bool IsDestinationPathSet() const;
 
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	static void InitColumns(IColumnsDefinition& rColumnDefs);
-	void Load(const ISerializerRowReaderPtr& spRowReader);
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		static void InitColumns(IColumnsDefinition& rColumnDefs);
+		void Load(const ISerializerRowReaderPtr& spRowReader);
 
-private:
+	private:
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	// modification management
-	typedef std::bitset<eMod_Last> BitSet;
-	mutable BitSet m_setModifications;
+		// modification management
+		typedef std::bitset<eMod_Last> BitSet;
+		mutable BitSet m_setModifications;
 
-	// attributes
-	object_id_t m_oidObjectID;
-	TSharedModificationTracker<TSmartPath, BitSet, eMod_SrcPath> m_pathSrc;
-	TSharedModificationTracker<bool, BitSet, eMod_SkipProcessing> m_bSkipFurtherProcessing;		// specifies if the path should be (or not) processed further
-	TSharedModificationTracker<TSmartPath, BitSet, eMod_DstPath> m_pathDst;
+		// attributes
+		object_id_t m_oidObjectID;
+		TSharedModificationTracker<TSmartPath, BitSet, eMod_SrcPath> m_pathSrc;
+		TSharedModificationTracker<bool, BitSet, eMod_SkipProcessing> m_bSkipFurtherProcessing;		// specifies if the path should be (or not) processed further
+		TSharedModificationTracker<TSmartPath, BitSet, eMod_DstPath> m_pathDst;
 #pragma warning(pop)
-};
+	};
 
-typedef boost::shared_ptr<TBasePathData> TBasePathDataPtr;
+	typedef boost::shared_ptr<TBasePathData> TBasePathDataPtr;
 
-//////////////////////////////////////////////////////////////////////////
-// TBasePathDataContainer
+	//////////////////////////////////////////////////////////////////////////
+	// TBasePathDataContainer
 
-class LIBCHCORE_API TBasePathDataContainer
-{
-public:
-	// constructors/destructor
-	TBasePathDataContainer();
-	~TBasePathDataContainer();
+	class LIBCHCORE_API TBasePathDataContainer
+	{
+	public:
+		// constructors/destructor
+		TBasePathDataContainer();
+		~TBasePathDataContainer();
 
-	TBasePathDataContainer& operator=(const TPathContainer& tPaths);
+		TBasePathDataContainer& operator=(const TPathContainer& tPaths);
 
-	// standard access to data
-	void Add(const TBasePathDataPtr& spEntry);
-	void RemoveAt(file_count_t fcIndex);
-	TBasePathDataPtr GetAt(file_count_t fcIndex) const;
-	TBasePathDataPtr FindByID(size_t fcObjectID) const;
+		// standard access to data
+		void Add(const TBasePathDataPtr& spEntry);
+		void RemoveAt(file_count_t fcIndex);
+		TBasePathDataPtr GetAt(file_count_t fcIndex) const;
+		TBasePathDataPtr FindByID(size_t fcObjectID) const;
 
-	void Clear();
+		void Clear();
 
-	bool IsEmpty() const;
-	file_count_t GetCount() const;
+		bool IsEmpty() const;
+		file_count_t GetCount() const;
 
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	void Load(const ISerializerContainerPtr& spContainer);
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		void Load(const ISerializerContainerPtr& spContainer);
 
-	void InitColumns(const ISerializerContainerPtr& spContainer) const;
+		void InitColumns(const ISerializerContainerPtr& spContainer) const;
 
-private:
-	TBasePathDataContainer(const TBasePathDataContainer& rSrc);
-	TBasePathDataContainer& operator=(const TBasePathDataContainer& rSrc);
+	private:
+		TBasePathDataContainer(const TBasePathDataContainer& rSrc);
+		TBasePathDataContainer& operator=(const TBasePathDataContainer& rSrc);
 
-	void ClearNL();
+		void ClearNL();
 
-protected:
+	protected:
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	typedef std::vector<TBasePathDataPtr> VecEntries;
-	VecEntries m_vEntries;
-	mutable TRemovedObjects m_setRemovedObjects;
+		typedef std::vector<TBasePathDataPtr> VecEntries;
+		VecEntries m_vEntries;
+		mutable TRemovedObjects m_setRemovedObjects;
 
-	mutable boost::shared_mutex m_lock;
+		mutable boost::shared_mutex m_lock;
 #pragma warning(pop)
-	object_id_t m_oidLastObjectID;
-};
+		object_id_t m_oidLastObjectID;
+	};
 
-typedef boost::shared_ptr<TBasePathDataContainer> TBasePathDataContainerPtr;
+	typedef boost::shared_ptr<TBasePathDataContainer> TBasePathDataContainerPtr;
+}
 
-END_CHCORE_NAMESPACE
-
 #endif // __TBASEPATHDATA_H__