Index: src/ch/CfgProperties.h =================================================================== diff -u -N -rca046f75806db6693a4b2dc6ddb255f76d0bbc3f -r3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a --- src/ch/CfgProperties.h (.../CfgProperties.h) (revision ca046f75806db6693a4b2dc6ddb255f76d0bbc3f) +++ src/ch/CfgProperties.h (.../CfgProperties.h) (revision 3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a) @@ -254,7 +254,7 @@ { typename PropData::value_type tValue; if(!rConfig.GetValue(CString(PropData::GetPropertyNamePrefix()) + PropData::GetPropertyName(), tValue)) - tValue = PropData::GetDefaultValue(); + tValue = PropData::GetDefaultValue(); return tValue; } Index: src/ch/TTaskOperationPlan.cpp =================================================================== diff -u -N -r044d0e17cdedf3055202486a2235e1a3c8dd6e56 -r3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a --- src/ch/TTaskOperationPlan.cpp (.../TTaskOperationPlan.cpp) (revision 044d0e17cdedf3055202486a2235e1a3c8dd6e56) +++ src/ch/TTaskOperationPlan.cpp (.../TTaskOperationPlan.cpp) (revision 3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a) @@ -32,13 +32,13 @@ } TOperationPlan::TOperationPlan(const TOperationPlan& rSrc) : - m_eOperation(eOperation_None), - m_vSubOperations() +m_eOperation(eOperation_None), + m_vSubOperations() { - boost::shared_lock src_lock(rSrc.m_lock); + boost::shared_lock src_lock(rSrc.m_lock); - m_eOperation = rSrc.m_eOperation; - m_vSubOperations = rSrc.m_vSubOperations; + m_eOperation = rSrc.m_eOperation; + m_vSubOperations = rSrc.m_vSubOperations; } TOperationPlan::~TOperationPlan() @@ -47,16 +47,16 @@ TOperationPlan& TOperationPlan::operator=(const TOperationPlan& rSrc) { - if(this != &rSrc) - { - boost::shared_lock src_lock(rSrc.m_lock); - boost::unique_lock lock(m_lock); + if(this != &rSrc) + { + boost::shared_lock src_lock(rSrc.m_lock); + boost::unique_lock lock(m_lock); - m_eOperation = rSrc.m_eOperation; - m_vSubOperations = rSrc.m_vSubOperations; - } + m_eOperation = rSrc.m_eOperation; + m_vSubOperations = rSrc.m_vSubOperations; + } - return *this; + return *this; } void TOperationPlan::SetOperationType(EOperationType eOperation) Index: src/ch/TTaskOperationPlan.h =================================================================== diff -u -N -r044d0e17cdedf3055202486a2235e1a3c8dd6e56 -r3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a --- src/ch/TTaskOperationPlan.h (.../TTaskOperationPlan.h) (revision 044d0e17cdedf3055202486a2235e1a3c8dd6e56) +++ src/ch/TTaskOperationPlan.h (.../TTaskOperationPlan.h) (revision 3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a) @@ -53,10 +53,10 @@ { public: TOperationPlan(); - TOperationPlan(const TOperationPlan& rSrc); + TOperationPlan(const TOperationPlan& rSrc); ~TOperationPlan(); - TOperationPlan& operator=(const TOperationPlan& rSrc); + TOperationPlan& operator=(const TOperationPlan& rSrc); void SetOperationType(EOperationType eOperation); EOperationType GetOperationType() const; Index: src/ch/task.h =================================================================== diff -u -N -r3f33c90e9e49ccf7b52b604e849ba8be5be1dba7 -r3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a --- src/ch/task.h (.../task.h) (revision 3f33c90e9e49ccf7b52b604e849ba8be5be1dba7) +++ src/ch/task.h (.../task.h) (revision 3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a) @@ -401,8 +401,8 @@ int GetDriveNumber(const CFileInfoPtr& spFileInfo); bool GetMove(const CFileInfoPtr& spFileInfo); - static void GetDriveData(const chcore::TSmartPath& spPath, int *piDrvNum, UINT *puiDrvType); - static bool PathExist(chcore::TSmartPath strPath); // check for file or folder existence + static void GetDriveData(const chcore::TSmartPath& spPath, int *piDrvNum, UINT *puiDrvType); + static bool PathExist(chcore::TSmartPath strPath); // check for file or folder existence private: // task initial information (needed to start a task); might be a bit processed. Index: src/libchcore/TPath.cpp =================================================================== diff -u -N -r591f291e22d2ece89acb266c8aa0b05c257a407c -r3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a --- src/libchcore/TPath.cpp (.../TPath.cpp) (revision 591f291e22d2ece89acb266c8aa0b05c257a407c) +++ src/libchcore/TPath.cpp (.../TPath.cpp) (revision 3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a) @@ -507,11 +507,11 @@ // ============================================================================ void TSmartPath::AddLengthExtension() { - if(!HasLengthExtension()) - { - PrepareToWrite(); - m_pPath->m_strPath.insert(0, _T("\\\\?\\")); - } + if(!HasLengthExtension()) + { + PrepareToWrite(); + m_pPath->m_strPath.insert(0, _T("\\\\?\\")); + } } // ============================================================================ @@ -522,11 +522,11 @@ // ============================================================================ void TSmartPath::DeleteLengthExtension() { - if(HasLengthExtension()) - { - PrepareToWrite(); - m_pPath->m_strPath.erase(m_pPath->m_strPath.begin(), m_pPath->m_strPath.begin() + 4); - } + if(HasLengthExtension()) + { + PrepareToWrite(); + m_pPath->m_strPath.erase(m_pPath->m_strPath.begin(), m_pPath->m_strPath.begin() + 4); + } } // ============================================================================ Index: src/libchcore/TPath.h =================================================================== diff -u -N -r591f291e22d2ece89acb266c8aa0b05c257a407c -r3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a --- src/libchcore/TPath.h (.../TPath.h) (revision 591f291e22d2ece89acb266c8aa0b05c257a407c) +++ src/libchcore/TPath.h (.../TPath.h) (revision 3fc1109991e7311d6b1e34ef0b730f9b4e1fd42a) @@ -53,13 +53,13 @@ BOOST_STATIC_CONSTANT(bool, DefaultCaseSensitivity = false); public: - // Construction/destruction + // Construction/destruction TSmartPath(); TSmartPath(const TSmartPath& spPath); ~TSmartPath(); - // operators + // operators TSmartPath& operator=(const TSmartPath& spPath); bool operator==(const TSmartPath& rPath) const; @@ -125,12 +125,18 @@ bool IsEmpty() const; - // Serialization + // Serialization template void load(Archive& ar, unsigned int /*uiVersion*/) { PrepareToWrite(); - ar & m_pPath->m_strPath; + if(m_pPath) + ar & m_pPath->m_strPath; + else + { + tstring_t strEmpty; + ar & strEmpty; + } } template