Index: src/ch/FileFilter.h =================================================================== diff -u -N -r5fd6beaad9f1eccb664b997d151acb59961e4827 -rde5a63babb2991c808333230014a4f2e6cc8b7b2 --- src/ch/FileFilter.h (.../FileFilter.h) (revision 5fd6beaad9f1eccb664b997d151acb59961e4827) +++ src/ch/FileFilter.h (.../FileFilter.h) (revision de5a63babb2991c808333230014a4f2e6cc8b7b2) @@ -44,11 +44,11 @@ bool Match(const CFileInfoPtr& spInfo) const; - CString& GetCombinedMask(CString& pMask) const; - void SetCombinedMask(const CString& pMask); + chcore::TString& GetCombinedMask(chcore::TString& pMask) const; + void SetCombinedMask(const chcore::TString& pMask); - CString& GetCombinedExcludeMask(CString& pMask) const; - void SetCombinedExcludeMask(const CString& pMask); + chcore::TString& GetCombinedExcludeMask(chcore::TString& pMask) const; + void SetCombinedExcludeMask(const chcore::TString& pMask); void StoreInConfig(chcore::TConfig& rConfig) const; void ReadFromConfig(const chcore::TConfig& rConfig); @@ -63,11 +63,11 @@ public: // files mask bool m_bUseMask; - std::vector m_astrMask; + chcore::TStringArray m_astrMask; // files mask- bool m_bUseExcludeMask; - std::vector m_astrExcludeMask; + chcore::TStringArray m_astrExcludeMask; // size filtering bool m_bUseSize;