Index: src/libchcore/TStringSet.h =================================================================== diff -u -N -rdd61ac70dd276425fe97970b49b6854d02bfcc87 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 --- src/libchcore/TStringSet.h (.../TStringSet.h) (revision dd61ac70dd276425fe97970b49b6854d02bfcc87) +++ src/libchcore/TStringSet.h (.../TStringSet.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) @@ -26,91 +26,90 @@ #include "TString.h" #include "libchcore.h" -BEGIN_CHCORE_NAMESPACE - -class LIBCHCORE_API TStringSetIterator +namespace chcore { -protected: - TStringSetIterator(std::set::iterator iterSet); + class LIBCHCORE_API TStringSetIterator + { + protected: + TStringSetIterator(std::set::iterator iterSet); -public: - TStringSetIterator(); - ~TStringSetIterator(); + public: + TStringSetIterator(); + ~TStringSetIterator(); - TStringSetIterator operator++(int); - TStringSetIterator& operator++(); + TStringSetIterator operator++(int); + TStringSetIterator& operator++(); - bool operator==(const TStringSetIterator& rSrc) const; - bool operator!=(const TStringSetIterator& rSrc) const; + bool operator==(const TStringSetIterator& rSrc) const; + bool operator!=(const TStringSetIterator& rSrc) const; - const TString& operator*() const; + const TString& operator*() const; -private: + private: #pragma warning(push) #pragma warning(disable: 4251) - std::set::iterator m_iterSet; + std::set::iterator m_iterSet; #pragma warning(pop) - friend class TStringSet; -}; + friend class TStringSet; + }; -class LIBCHCORE_API TStringSetConstIterator -{ -protected: - TStringSetConstIterator(std::set::const_iterator iterSet); + class LIBCHCORE_API TStringSetConstIterator + { + protected: + TStringSetConstIterator(std::set::const_iterator iterSet); -public: - TStringSetConstIterator(); - ~TStringSetConstIterator(); + public: + TStringSetConstIterator(); + ~TStringSetConstIterator(); - TStringSetConstIterator operator++(int); - TStringSetConstIterator& operator++(); + TStringSetConstIterator operator++(int); + TStringSetConstIterator& operator++(); - bool operator==(const TStringSetConstIterator& rSrc) const; - bool operator!=(const TStringSetConstIterator& rSrc) const; + bool operator==(const TStringSetConstIterator& rSrc) const; + bool operator!=(const TStringSetConstIterator& rSrc) const; - const TString& operator*() const; + const TString& operator*() const; -private: + private: #pragma warning(push) #pragma warning(disable: 4251) - std::set::const_iterator m_iterSet; + std::set::const_iterator m_iterSet; #pragma warning(pop) - friend class TStringSet; -}; + friend class TStringSet; + }; -class LIBCHCORE_API TStringSet -{ -public: - typedef TStringSetIterator iterator; - typedef TStringSetConstIterator const_iterator; + class LIBCHCORE_API TStringSet + { + public: + typedef TStringSetIterator iterator; + typedef TStringSetConstIterator const_iterator; -public: - TStringSet(); - ~TStringSet(); + public: + TStringSet(); + ~TStringSet(); - void Insert(const TString& str); - void Insert(const TStringSet& setStrings); - void Remove(const TString& str); - void Clear(); + void Insert(const TString& str); + void Insert(const TStringSet& setStrings); + void Remove(const TString& str); + void Clear(); - bool HasValue(const TString& str) const; - size_t GetCount() const; - bool IsEmpty() const; + bool HasValue(const TString& str) const; + size_t GetCount() const; + bool IsEmpty() const; - TStringSetIterator Begin(); - TStringSetIterator End(); - TStringSetConstIterator Begin() const; - TStringSetConstIterator End() const; + TStringSetIterator Begin(); + TStringSetIterator End(); + TStringSetConstIterator Begin() const; + TStringSetConstIterator End() const; -private: + private: #pragma warning(push) #pragma warning(disable: 4251) - std::set m_setItems; + std::set m_setItems; #pragma warning(pop) -}; + }; +} -END_CHCORE_NAMESPACE - #endif