Index: src/libchcore/TPath.h =================================================================== diff -u -r1342b18babc7e88850e74f46cb473a737a68f28a -rb1e03eb232a784d6e2d40f67cbbbb33be0972228 --- src/libchcore/TPath.h (.../TPath.h) (revision 1342b18babc7e88850e74f46cb473a737a68f28a) +++ src/libchcore/TPath.h (.../TPath.h) (revision b1e03eb232a784d6e2d40f67cbbbb33be0972228) @@ -20,7 +20,7 @@ #define __TPATH_H__ #include "libchcore.h" -#include "TConfig.h" +#include "TString.h" BEGIN_CHCORE_NAMESPACE @@ -72,6 +72,7 @@ TSmartPath& operator=(const TSmartPath& spPath); bool operator==(const TSmartPath& rPath) const; + bool operator!=(const TSmartPath& rPath) const; bool operator<(const TSmartPath& rPath) const; bool operator>(const TSmartPath& rPath) const; @@ -141,13 +142,6 @@ bool IsEmpty() const; size_t GetLength() const; - // Serialization - void Serialize(TReadBinarySerializer& rSerializer); - void Serialize(TWriteBinarySerializer& rSerializer) const; - - void StoreInConfig(TConfig& rConfig, PCTSTR pszPropName) const; - bool ReadFromConfig(const TConfig& rConfig, PCTSTR pszPropName); - protected: void PrepareToWrite(); @@ -160,42 +154,6 @@ LIBCHCORE_API TSmartPath PathFromString(const wchar_t* pszPath); LIBCHCORE_API TSmartPath PathFromWString(const TString& strPath); -class LIBCHCORE_API TPathContainer -{ -public: - TPathContainer(); - TPathContainer(const TPathContainer& rSrcContainer); - ~TPathContainer(); - - TPathContainer& operator=(const TPathContainer& rSrcContainer); - - void Add(const TSmartPath& spPath); - void Append(const TPathContainer& vPaths); - - const TSmartPath& GetAt(size_t stIndex) const; - TSmartPath& GetAt(size_t stIndex); - - void SetAt(size_t stIndex, const TSmartPath& spPath); - - void DeleteAt(size_t stIndex); - void Clear(); - - size_t GetCount() const; - bool IsEmpty() const; - - void StoreInConfig(TConfig& rConfig, PCTSTR pszPropName) const; - bool ReadFromConfig(const TConfig& rConfig, PCTSTR pszPropName); - -private: -#pragma warning(push) -#pragma warning(disable: 4251) - std::vector m_vPaths; -#pragma warning(pop) -}; - END_CHCORE_NAMESPACE -CONFIG_MEMBER_SERIALIZATION(TSmartPath) -CONFIG_MEMBER_SERIALIZATION(TPathContainer) - #endif