Index: src/libchcore/TFileFilter.h
===================================================================
diff -u -N -r2755e12daeccb1935f569e7235e685e566b0b098 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TFileFilter.h	(.../TFileFilter.h)	(revision 2755e12daeccb1935f569e7235e685e566b0b098)
+++ src/libchcore/TFileFilter.h	(.../TFileFilter.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -27,237 +27,236 @@
 #include <bitset>
 #include "TSharedModificationTracker.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-class TConfig;
-class TFileInfo;
-typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
-
-class LIBCHCORE_API TFileFilter
+namespace chcore
 {
-public:
-	enum ESizeCompareType
-	{
-		eSizeCmp_Less = 0,
-		eSizeCmp_LessOrEqual = 1,
-		eSizeCmp_Equal = 2,
-		eSizeCmp_GreaterOrEqual = 3,
-		eSizeCmp_Greater = 4
-	};
+	class TConfig;
+	class TFileInfo;
+	typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
 
-	enum EDateCompareType
+	class LIBCHCORE_API TFileFilter
 	{
-		eDateCmp_Less = 0,
-		eDateCmp_LessOrEqual = 1,
-		eDateCmp_Equal = 2,
-		eDateCmp_GreaterOrEqual = 3,
-		eDateCmp_Greater = 4
-	};
+	public:
+		enum ESizeCompareType
+		{
+			eSizeCmp_Less = 0,
+			eSizeCmp_LessOrEqual = 1,
+			eSizeCmp_Equal = 2,
+			eSizeCmp_GreaterOrEqual = 3,
+			eSizeCmp_Greater = 4
+		};
 
-	enum EDateType
-	{
-		eDateType_Created = 0,
-		eDateType_Modified = 1,
-		eDateType_LastAccessed = 2
-	};
+		enum EDateCompareType
+		{
+			eDateCmp_Less = 0,
+			eDateCmp_LessOrEqual = 1,
+			eDateCmp_Equal = 2,
+			eDateCmp_GreaterOrEqual = 3,
+			eDateCmp_Greater = 4
+		};
 
-public:
-	TFileFilter();
-	TFileFilter(const TFileFilter& rFilter);
-	TFileFilter& operator=(const TFileFilter& rFilter);
+		enum EDateType
+		{
+			eDateType_Created = 0,
+			eDateType_Modified = 1,
+			eDateType_LastAccessed = 2
+		};
 
-	void SetData(const TFileFilter& rSrc);
+	public:
+		TFileFilter();
+		TFileFilter(const TFileFilter& rFilter);
+		TFileFilter& operator=(const TFileFilter& rFilter);
 
-	// matching
-	bool Match(const TFileInfoPtr& spInfo) const;
+		void SetData(const TFileFilter& rSrc);
 
-	// serialization
-	void StoreInConfig(TConfig& rConfig) const;
-	void ReadFromConfig(const TConfig& rConfig);
+		// matching
+		bool Match(const TFileInfoPtr& spInfo) const;
 
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	void Load(const ISerializerRowReaderPtr& spRowReader);
-	static void InitColumns(IColumnsDefinition& rColumns);
+		// serialization
+		void StoreInConfig(TConfig& rConfig) const;
+		void ReadFromConfig(const TConfig& rConfig);
 
-	// other
-	object_id_t GetObjectID() const;
-	void SetObjectID(object_id_t oidObjectID);
-	void ResetModifications();
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		void Load(const ISerializerRowReaderPtr& spRowReader);
+		static void InitColumns(IColumnsDefinition& rColumns);
 
-	// atrributes access
-	bool GetUseMask() const;
-	void SetUseMask(bool bUseMask);
+		// other
+		object_id_t GetObjectID() const;
+		void SetObjectID(object_id_t oidObjectID);
+		void ResetModifications();
 
-	TString GetCombinedMask() const;
-	void SetCombinedMask(const TString& pMask);
+		// atrributes access
+		bool GetUseMask() const;
+		void SetUseMask(bool bUseMask);
 
-	bool GetUseExcludeMask() const;
-	void SetUseExcludeMask(bool bUseExcludeMask);
+		TString GetCombinedMask() const;
+		void SetCombinedMask(const TString& pMask);
 
-	TString GetCombinedExcludeMask() const;
-	void SetCombinedExcludeMask(const TString& pMask);
+		bool GetUseExcludeMask() const;
+		void SetUseExcludeMask(bool bUseExcludeMask);
 
-	bool GetUseSize1() const;
-	void SetUseSize1(bool bUseSize1);
+		TString GetCombinedExcludeMask() const;
+		void SetCombinedExcludeMask(const TString& pMask);
 
-	ESizeCompareType GetSizeType1() const;
-	void SetSizeType1(ESizeCompareType eSizeType1);
+		bool GetUseSize1() const;
+		void SetUseSize1(bool bUseSize1);
 
-	unsigned long long GetSize1() const;
-	void SetSize1(unsigned long long ullSize1);
+		ESizeCompareType GetSizeType1() const;
+		void SetSizeType1(ESizeCompareType eSizeType1);
 
-	bool GetUseSize2() const;
-	void SetUseSize2(bool bUseSize2);
+		unsigned long long GetSize1() const;
+		void SetSize1(unsigned long long ullSize1);
 
-	ESizeCompareType GetSizeType2() const;
-	void SetSizeType2(ESizeCompareType eSizeType2);
+		bool GetUseSize2() const;
+		void SetUseSize2(bool bUseSize2);
 
-	unsigned long long GetSize2() const;
-	void SetSize2(unsigned long long ullSize2);
+		ESizeCompareType GetSizeType2() const;
+		void SetSizeType2(ESizeCompareType eSizeType2);
 
-	// dates
-	TFileFilter::EDateType GetDateType() const;
-	void SetDateType(TFileFilter::EDateType eDateType);
+		unsigned long long GetSize2() const;
+		void SetSize2(unsigned long long ullSize2);
 
-	// date 1
-	bool GetUseDateTime1() const;
-	void SetUseDateTime1(bool bUseDateTime1);
+		// dates
+		TFileFilter::EDateType GetDateType() const;
+		void SetDateType(TFileFilter::EDateType eDateType);
 
-	TFileFilter::EDateCompareType GetDateCmpType1() const;
-	void SetDateCmpType1(TFileFilter::EDateCompareType eCmpType1);
+		// date 1
+		bool GetUseDateTime1() const;
+		void SetUseDateTime1(bool bUseDateTime1);
 
-	bool GetUseDate1() const;
-	void SetUseDate1(bool tDate1);
+		TFileFilter::EDateCompareType GetDateCmpType1() const;
+		void SetDateCmpType1(TFileFilter::EDateCompareType eCmpType1);
 
-	bool GetUseTime1() const;
-	void SetUseTime1(bool tTime1);
+		bool GetUseDate1() const;
+		void SetUseDate1(bool tDate1);
 
-	const TDateTime& GetDateTime1() const;
-	void SetDateTime1(const TDateTime& tDateTime1);
+		bool GetUseTime1() const;
+		void SetUseTime1(bool tTime1);
 
-	// date 2
-	bool GetUseDateTime2() const;
-	void SetUseDateTime2(bool bUseDateTime2);
+		const TDateTime& GetDateTime1() const;
+		void SetDateTime1(const TDateTime& tDateTime1);
 
-	TFileFilter::EDateCompareType GetDateCmpType2() const;
-	void SetDateCmpType2(TFileFilter::EDateCompareType eCmpType2);
+		// date 2
+		bool GetUseDateTime2() const;
+		void SetUseDateTime2(bool bUseDateTime2);
 
-	bool GetUseDate2() const;
-	void SetUseDate2(bool tDate2);
+		TFileFilter::EDateCompareType GetDateCmpType2() const;
+		void SetDateCmpType2(TFileFilter::EDateCompareType eCmpType2);
 
-	bool GetUseTime2() const;
-	void SetUseTime2(bool tTime2);
+		bool GetUseDate2() const;
+		void SetUseDate2(bool tDate2);
 
-	const TDateTime& GetDateTime2() const;
-	void SetDateTime2(const TDateTime& tDateTime2);
+		bool GetUseTime2() const;
+		void SetUseTime2(bool tTime2);
 
-	// attributes
-	bool GetUseAttributes() const;
-	void SetUseAttributes(bool bUseAttributes);
+		const TDateTime& GetDateTime2() const;
+		void SetDateTime2(const TDateTime& tDateTime2);
 
-	int GetArchive() const;
-	void SetArchive(int iArchive);
+		// attributes
+		bool GetUseAttributes() const;
+		void SetUseAttributes(bool bUseAttributes);
 
-	int GetReadOnly() const;
-	void SetReadOnly(int iReadOnly);
+		int GetArchive() const;
+		void SetArchive(int iArchive);
 
-	int GetHidden() const;
-	void SetHidden(int iHidden);
+		int GetReadOnly() const;
+		void SetReadOnly(int iReadOnly);
 
-	int GetSystem() const { return m_iSystem; }
-	void SetSystem(int iSystem) { m_iSystem = iSystem; }
+		int GetHidden() const;
+		void SetHidden(int iHidden);
 
-	int GetDirectory() const { return m_iDirectory; }
-	void SetDirectory(int iDirectory) { m_iDirectory = iDirectory; }
+		int GetSystem() const { return m_iSystem; }
+		void SetSystem(int iSystem) { m_iSystem = iSystem; }
 
-private:
-	enum EModifications
-	{
-		eMod_Added,
-		eMod_UseMask,
-		eMod_Mask,
-		eMod_UseExcludeMask,
-		eMod_ExcludeMask,
-		eMod_UseSize1,
-		eMod_SizeCmpType1,
-		eMod_Size1,
-		eMod_UseSize2,
-		eMod_SizeCmpType2,
-		eMod_Size2,
-		eMod_DateType,
-		eMod_UseDateTime1,
-		eMod_DateCmpType1,
-		eMod_UseDate1,
-		eMod_UseTime1,
-		eMod_DateTime1,
-		eMod_UseDateTime2,
-		eMod_DateCmpType2,
-		eMod_UseDate2,
-		eMod_UseTime2,
-		eMod_DateTime2,
-		eMod_UseAttributes,
-		eMod_AttrArchive,
-		eMod_AttrReadOnly,
-		eMod_AttrHidden,
-		eMod_AttrSystem,
-		eMod_AttrDirectory,
+		int GetDirectory() const { return m_iDirectory; }
+		void SetDirectory(int iDirectory) { m_iDirectory = iDirectory; }
 
-		eMod_Last
-	};
+	private:
+		enum EModifications
+		{
+			eMod_Added,
+			eMod_UseMask,
+			eMod_Mask,
+			eMod_UseExcludeMask,
+			eMod_ExcludeMask,
+			eMod_UseSize1,
+			eMod_SizeCmpType1,
+			eMod_Size1,
+			eMod_UseSize2,
+			eMod_SizeCmpType2,
+			eMod_Size2,
+			eMod_DateType,
+			eMod_UseDateTime1,
+			eMod_DateCmpType1,
+			eMod_UseDate1,
+			eMod_UseTime1,
+			eMod_DateTime1,
+			eMod_UseDateTime2,
+			eMod_DateCmpType2,
+			eMod_UseDate2,
+			eMod_UseTime2,
+			eMod_DateTime2,
+			eMod_UseAttributes,
+			eMod_AttrArchive,
+			eMod_AttrReadOnly,
+			eMod_AttrHidden,
+			eMod_AttrSystem,
+			eMod_AttrDirectory,
 
-	// object identification
-	object_id_t m_oidObjectID;
+			eMod_Last
+		};
 
-	// modification management
+		// object identification
+		object_id_t m_oidObjectID;
+
+		// modification management
 #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;
 
-	// files mask
-	TSharedModificationTracker<bool, Bitset, eMod_UseMask> m_bUseMask;
-	TSharedModificationTracker<TStringPatternArray, Bitset, eMod_Mask> m_astrMask;
+		// files mask
+		TSharedModificationTracker<bool, Bitset, eMod_UseMask> m_bUseMask;
+		TSharedModificationTracker<TStringPatternArray, Bitset, eMod_Mask> m_astrMask;
 
-	// files mask-
-	TSharedModificationTracker<bool, Bitset, eMod_UseExcludeMask> m_bUseExcludeMask;
-	TSharedModificationTracker<TStringPatternArray, Bitset, eMod_ExcludeMask> m_astrExcludeMask;
+		// files mask-
+		TSharedModificationTracker<bool, Bitset, eMod_UseExcludeMask> m_bUseExcludeMask;
+		TSharedModificationTracker<TStringPatternArray, Bitset, eMod_ExcludeMask> m_astrExcludeMask;
 
-	// size filtering
-	TSharedModificationTracker<bool, Bitset, eMod_UseSize1> m_bUseSize1;
-	TSharedModificationTracker<ESizeCompareType, Bitset, eMod_SizeCmpType1> m_eSizeCmpType1;
-	TSharedModificationTracker<unsigned long long, Bitset, eMod_Size1> m_ullSize1;
+		// size filtering
+		TSharedModificationTracker<bool, Bitset, eMod_UseSize1> m_bUseSize1;
+		TSharedModificationTracker<ESizeCompareType, Bitset, eMod_SizeCmpType1> m_eSizeCmpType1;
+		TSharedModificationTracker<unsigned long long, Bitset, eMod_Size1> m_ullSize1;
 
-	TSharedModificationTracker<bool, Bitset, eMod_UseSize2> m_bUseSize2;
-	TSharedModificationTracker<ESizeCompareType, Bitset, eMod_SizeCmpType2> m_eSizeCmpType2;
-	TSharedModificationTracker<unsigned long long, Bitset, eMod_Size2> m_ullSize2;
+		TSharedModificationTracker<bool, Bitset, eMod_UseSize2> m_bUseSize2;
+		TSharedModificationTracker<ESizeCompareType, Bitset, eMod_SizeCmpType2> m_eSizeCmpType2;
+		TSharedModificationTracker<unsigned long long, Bitset, eMod_Size2> m_ullSize2;
 
-	// date filtering
-	TSharedModificationTracker<EDateType, Bitset, eMod_DateType> m_eDateType;	// created/last modified/last accessed
+		// date filtering
+		TSharedModificationTracker<EDateType, Bitset, eMod_DateType> m_eDateType;	// created/last modified/last accessed
 
-	TSharedModificationTracker<bool, Bitset, eMod_UseDateTime1> m_bUseDateTime1;
+		TSharedModificationTracker<bool, Bitset, eMod_UseDateTime1> m_bUseDateTime1;
 
-	TSharedModificationTracker<EDateCompareType, Bitset, eMod_DateCmpType1> m_eDateCmpType1;	// before/after
-	TSharedModificationTracker<bool, Bitset, eMod_UseDate1> m_bUseDate1;
-	TSharedModificationTracker<bool, Bitset, eMod_UseTime1> m_bUseTime1;
-	TSharedModificationTracker<TDateTime, Bitset, eMod_DateTime1> m_tDateTime1;
+		TSharedModificationTracker<EDateCompareType, Bitset, eMod_DateCmpType1> m_eDateCmpType1;	// before/after
+		TSharedModificationTracker<bool, Bitset, eMod_UseDate1> m_bUseDate1;
+		TSharedModificationTracker<bool, Bitset, eMod_UseTime1> m_bUseTime1;
+		TSharedModificationTracker<TDateTime, Bitset, eMod_DateTime1> m_tDateTime1;
 
-	TSharedModificationTracker<bool, Bitset, eMod_UseDateTime2> m_bUseDateTime2;
+		TSharedModificationTracker<bool, Bitset, eMod_UseDateTime2> m_bUseDateTime2;
 
-	TSharedModificationTracker<EDateCompareType, Bitset, eMod_DateCmpType2> m_eDateCmpType2;
-	TSharedModificationTracker<bool, Bitset, eMod_UseDate2> m_bUseDate2;
-	TSharedModificationTracker<bool, Bitset, eMod_UseTime2> m_bUseTime2;
-	TSharedModificationTracker<TDateTime, Bitset, eMod_DateTime2> m_tDateTime2;
+		TSharedModificationTracker<EDateCompareType, Bitset, eMod_DateCmpType2> m_eDateCmpType2;
+		TSharedModificationTracker<bool, Bitset, eMod_UseDate2> m_bUseDate2;
+		TSharedModificationTracker<bool, Bitset, eMod_UseTime2> m_bUseTime2;
+		TSharedModificationTracker<TDateTime, Bitset, eMod_DateTime2> m_tDateTime2;
 
-	// attribute filtering
-	TSharedModificationTracker<bool, Bitset, eMod_UseAttributes> m_bUseAttributes;
-	TSharedModificationTracker<int, Bitset, eMod_AttrArchive> m_iArchive;
-	TSharedModificationTracker<int, Bitset, eMod_AttrReadOnly> m_iReadOnly;
-	TSharedModificationTracker<int, Bitset, eMod_AttrHidden> m_iHidden;
-	TSharedModificationTracker<int, Bitset, eMod_AttrSystem> m_iSystem;
-	TSharedModificationTracker<int, Bitset, eMod_AttrDirectory> m_iDirectory;
+		// attribute filtering
+		TSharedModificationTracker<bool, Bitset, eMod_UseAttributes> m_bUseAttributes;
+		TSharedModificationTracker<int, Bitset, eMod_AttrArchive> m_iArchive;
+		TSharedModificationTracker<int, Bitset, eMod_AttrReadOnly> m_iReadOnly;
+		TSharedModificationTracker<int, Bitset, eMod_AttrHidden> m_iHidden;
+		TSharedModificationTracker<int, Bitset, eMod_AttrSystem> m_iSystem;
+		TSharedModificationTracker<int, Bitset, eMod_AttrDirectory> m_iDirectory;
 #pragma warning(pop)
-};
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif