Index: src/ch/FileInfo.h
===================================================================
diff -u -N -r6ae1d95bf7dd071fd2b65b8f7aabca1c887bdff8 -r52e4374b1e7044f77439e34581780750675125a7
--- src/ch/FileInfo.h	(.../FileInfo.h)	(revision 6ae1d95bf7dd071fd2b65b8f7aabca1c887bdff8)
+++ src/ch/FileInfo.h	(.../FileInfo.h)	(revision 52e4374b1e7044f77439e34581780750675125a7)
@@ -57,97 +57,13 @@
 void FindFreeSubstituteName(CString strSrcPath, CString strDstPath, CString* pstrResult);
 extern void GetDriveData(LPCTSTR lpszPath, int *piDrvNum, UINT *puiDrvType);
 
-// definitions for comparing sizes and dates
-#define LT 0
-#define LE 1
-#define EQ 2
-#define GE 3
-#define GT 4
-
-// date type defs
-#define DATE_CREATED		0
-#define DATE_MODIFIED		1
-#define DATE_LASTACCESSED	2
-
 // CFileInfo flags
 // flag stating that file has been processed (used to determine if file can be deleted at the end of copying)     
 #define FIF_PROCESSED		0x00000001
 
-class CFileInfo;
-
-class CFileFilter
-{
-public:
-	CFileFilter();
-	CFileFilter(const CFileFilter& rFilter);
-	CFileFilter& operator=(const CFileFilter& rFilter);
-
-	bool Match(const CFileInfo& rInfo) const;
-
-	CString& GetCombinedMask(CString& pMask) const;
-	void SetCombinedMask(const CString& pMask);
-
-	CString& GetCombinedExcludeMask(CString& pMask) const;
-	void SetCombinedExcludeMask(const CString& pMask);
-
-	void Serialize(icpf::archive& ar);
-
-protected:
-	bool MatchMask(LPCTSTR lpszMask, LPCTSTR lpszString) const;
-	bool Scan(LPCTSTR& lpszMask, LPCTSTR& lpszString) const;
-
-public:
-	// files mask
-	bool m_bUseMask;
-	CStringArray m_astrMask;
-
-	// files mask-
-	bool m_bUseExcludeMask;
-	CStringArray m_astrExcludeMask;
-
-	// size filtering
-	bool m_bUseSize;
-	int m_iSizeType1;
-	unsigned __int64 m_ullSize1;
-	bool m_bUseSize2;
-	int m_iSizeType2;
-	unsigned __int64 m_ullSize2;
-
-	// date filtering
-	bool m_bUseDate;
-	int m_iDateType;	// created/last modified/last accessed
-	int m_iDateType1;	// before/after
-	bool m_bDate1;
-	CTime m_tDate1;
-	bool m_bTime1;
-	CTime m_tTime1;
-
-	bool m_bUseDate2;
-	int m_iDateType2;
-	bool m_bDate2;
-	CTime m_tDate2;
-	bool m_bTime2;
-	CTime m_tTime2;
-
-	// attribute filtering
-	bool m_bUseAttributes;
-	int m_iArchive;
-	int m_iReadOnly;
-	int m_iHidden;
-	int m_iSystem;
-	int m_iDirectory;
-};
-
-class CFiltersArray : public CArray<CFileFilter, CFileFilter>
-{
-public:
-	bool Match(const CFileInfo& rInfo) const;
-	void Serialize(icpf::archive& ar);
-};
-
+class CFiltersArray;
 /////////////////////////////////////////////////////////////////////////////
 // CClipboardEntry
-
 class CClipboardEntry
 {
 public: