Index: src/ch/TTaskDefinition.cpp =================================================================== diff -u -N -r3f72015a9db19bd1b0a5e20e0f1aa0ec00bda529 -r69b48f0b4d7fad78f95854e95fca166014311474 --- src/ch/TTaskDefinition.cpp (.../TTaskDefinition.cpp) (revision 3f72015a9db19bd1b0a5e20e0f1aa0ec00bda529) +++ src/ch/TTaskDefinition.cpp (.../TTaskDefinition.cpp) (revision 69b48f0b4d7fad78f95854e95fca166014311474) @@ -73,29 +73,29 @@ // Source paths // initialize object with data (get/set, from cfg file?, from string(cmd line options)) -void TTaskDefinition::AddSourcePath(const CString& strPath) +void TTaskDefinition::AddSourcePath(const chcore::TSmartPath& tPath) { - m_vSourcePaths.push_back(strPath); + m_vSourcePaths.Add(tPath); m_bModified = true; } -CString TTaskDefinition::GetSourcePathAt(size_t stIndex) const +chcore::TSmartPath TTaskDefinition::GetSourcePathAt(size_t stIndex) const { - return m_vSourcePaths.at(stIndex); + return m_vSourcePaths.GetAt(stIndex); } size_t TTaskDefinition::GetSourcePathCount() const { - return m_vSourcePaths.size(); + return m_vSourcePaths.GetCount(); } void TTaskDefinition::ClearSourcePaths() { - m_vSourcePaths.clear(); + m_vSourcePaths.Clear(); m_bModified = true; } -const std::vector& TTaskDefinition::GetSourcePaths() const +const chcore::TPathContainer& TTaskDefinition::GetSourcePaths() const { return m_vSourcePaths; } @@ -156,7 +156,7 @@ // clear everything m_strTaskUniqueID.Empty(); - m_vSourcePaths.clear(); + m_vSourcePaths.Clear(); m_pathDestinationPath.Clear(); m_tConfiguration.Clear(); @@ -175,7 +175,7 @@ } // basic information - if(!tTaskInfo.GetValue(_T("TaskDefinition.SourcePaths"), m_vSourcePaths) || m_vSourcePaths.empty()) + if(!tTaskInfo.GetValue(_T("TaskDefinition.SourcePaths"), m_vSourcePaths) || m_vSourcePaths.IsEmpty()) THROW(_T("Missing source paths"), 0, 0, 0); if(!tTaskInfo.GetValue(_T("TaskDefinition.DestinationPath"), m_pathDestinationPath) || m_pathDestinationPath.IsEmpty())