Index: src/libchcore/TFileFiltersArray.h =================================================================== diff -u -N -re92d7e2b63df1305b23aa04132c45ad8747dc22c -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 --- src/libchcore/TFileFiltersArray.h (.../TFileFiltersArray.h) (revision e92d7e2b63df1305b23aa04132c45ad8747dc22c) +++ src/libchcore/TFileFiltersArray.h (.../TFileFiltersArray.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) @@ -24,49 +24,48 @@ #include "ISerializerContainer.h" #include "TRemovedObjects.h" -BEGIN_CHCORE_NAMESPACE - -class TConfig; -class TFileInfo; -typedef boost::shared_ptr TFileInfoPtr; - -class LIBCHCORE_API TFileFiltersArray +namespace chcore { -public: - TFileFiltersArray(); - ~TFileFiltersArray(); + class TConfig; + class TFileInfo; + typedef boost::shared_ptr TFileInfoPtr; - TFileFiltersArray& operator=(const TFileFiltersArray& rSrc); - bool Match(const TFileInfoPtr& spInfo) const; + class LIBCHCORE_API TFileFiltersArray + { + public: + TFileFiltersArray(); + ~TFileFiltersArray(); - void StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const; - bool ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName); + TFileFiltersArray& operator=(const TFileFiltersArray& rSrc); + bool Match(const TFileInfoPtr& spInfo) const; - void Store(const ISerializerContainerPtr& spContainer) const; - void Load(const ISerializerContainerPtr& spContainer); + void StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const; + bool ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName); - void InitColumns(const ISerializerContainerPtr& spContainer) const; + void Store(const ISerializerContainerPtr& spContainer) const; + void Load(const ISerializerContainerPtr& spContainer); - bool IsEmpty() const; + void InitColumns(const ISerializerContainerPtr& spContainer) const; - void Add(const TFileFilter& rFilter); - bool SetAt(size_t stIndex, const TFileFilter& rNewFilter); - const TFileFilter* GetAt(size_t stIndex) const; - bool RemoveAt(size_t stIndex); - size_t GetSize() const; + bool IsEmpty() const; - void Clear(); + void Add(const TFileFilter& rFilter); + bool SetAt(size_t stIndex, const TFileFilter& rNewFilter); + const TFileFilter* GetAt(size_t stIndex) const; + bool RemoveAt(size_t stIndex); + size_t GetSize() const; -private: + void Clear(); + + private: #pragma warning(push) #pragma warning(disable: 4251) - std::vector m_vFilters; + std::vector m_vFilters; #pragma warning(pop) - mutable TRemovedObjects m_setRemovedObjects; -}; + mutable TRemovedObjects m_setRemovedObjects; + }; +} -END_CHCORE_NAMESPACE - CONFIG_MEMBER_SERIALIZATION(TFileFiltersArray) #endif