Index: src/libchcore/TBasePathData.h =================================================================== diff -u -N -rd345f15636dc88c4c40fe310ac7777bd024e12d9 -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05 --- src/libchcore/TBasePathData.h (.../TBasePathData.h) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9) +++ src/libchcore/TBasePathData.h (.../TBasePathData.h) (revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05) @@ -39,17 +39,17 @@ void SetMove(bool bValue) { m_bMove=bValue; } bool GetMove() const { return m_bMove; } - void SetDestinationPath(const chcore::TSmartPath& strPath); - chcore::TSmartPath GetDestinationPath() const; + void SetDestinationPath(const TSmartPath& strPath); + TSmartPath GetDestinationPath() const; bool IsDestinationPathSet() const { return !m_pathDst.IsEmpty(); } - void Serialize(chcore::TReadBinarySerializer& rSerializer, bool bData); - void Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bData); + void Serialize(TReadBinarySerializer& rSerializer, bool bData); + void Serialize(TWriteBinarySerializer& rSerializer, bool bData); private: bool m_bMove; // specifies if we can use MoveFile (if will be moved) - chcore::TSmartPath m_pathDst; // dest path + TSmartPath m_pathDst; // dest path }; typedef boost::shared_ptr TBasePathDataPtr; @@ -61,7 +61,7 @@ { public: // constructors/destructor - explicit TBasePathDataContainer(const chcore::TPathContainer& tBasePaths); + explicit TBasePathDataContainer(const TPathContainer& tBasePaths); ~TBasePathDataContainer(); // standard access to data @@ -75,15 +75,15 @@ void Clear(); // serialization - void Serialize(chcore::TReadBinarySerializer& rSerializer, bool bData); - void Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bData); + void Serialize(TReadBinarySerializer& rSerializer, bool bData); + void Serialize(TWriteBinarySerializer& rSerializer, bool bData); private: TBasePathDataContainer(const TBasePathDataContainer& rSrc); TBasePathDataContainer& operator=(const TBasePathDataContainer& rSrc); protected: - const chcore::TPathContainer& m_tBasePaths; + const TPathContainer& m_tBasePaths; #pragma warning(push) #pragma warning(disable: 4251)