Index: src/libchcore/TPath.cpp =================================================================== diff -u -N -r548382442cbf7bed7f744b279ce3f66b54992724 -r9545b48aadb1592a5bf22ac5a227b1666d7710c6 --- src/libchcore/TPath.cpp (.../TPath.cpp) (revision 548382442cbf7bed7f744b279ce3f66b54992724) +++ src/libchcore/TPath.cpp (.../TPath.cpp) (revision 9545b48aadb1592a5bf22ac5a227b1666d7710c6) @@ -208,7 +208,7 @@ m_pPath->m_strPath += pathToAppend.m_pPath->m_strPath; else { - m_pPath->m_strPath.DeleteChar(m_pPath->m_strPath.GetLength() - 1); + m_pPath->m_strPath.Delete(m_pPath->m_strPath.GetLength() - 1, 1); m_pPath->m_strPath += pathToAppend.m_pPath->m_strPath; } } @@ -776,7 +776,7 @@ size_t stEnd = m_pPath->m_strPath.FindLastOf(_T("/\\")); if(stStart != TString::npos && stEnd >= stStart) - return PathFromWString(m_pPath->m_strPath.MidByPos(stStart, stEnd + 1)); + return PathFromWString(m_pPath->m_strPath.MidRange(stStart, stEnd + 1)); return TSmartPath(); } @@ -826,7 +826,7 @@ if(stEnd == TString::npos || stEnd < stStart) // if does not exist or we have ".\\", use up to the end stEnd = m_pPath->m_strPath.GetLength(); - return PathFromWString(m_pPath->m_strPath.MidByPos(stStart + 1, stEnd)); + return PathFromWString(m_pPath->m_strPath.MidRange(stStart + 1, stEnd)); } // ============================================================================ @@ -861,7 +861,7 @@ size_t stIndex = m_pPath->m_strPath.FindLastOf(_T("\\/.")); if(stIndex != TString::npos && m_pPath->m_strPath.GetAt(stIndex) == _T('.')) - return PathFromWString(m_pPath->m_strPath.MidByPos(stIndex, m_pPath->m_strPath.GetLength())); // ".txt" for "c:\windows\test.txt" + return PathFromWString(m_pPath->m_strPath.MidRange(stIndex, m_pPath->m_strPath.GetLength())); // ".txt" for "c:\windows\test.txt" return TSmartPath(); } @@ -896,7 +896,7 @@ size_t stIndex = m_pPath->m_strPath.FindLastOf(_T("\\/")); if(stIndex != TString::npos) - return PathFromWString(m_pPath->m_strPath.MidByPos(stIndex + 1, m_pPath->m_strPath.GetLength())); // "test.txt" for "c:\windows\test.txt" + return PathFromWString(m_pPath->m_strPath.MidRange(stIndex + 1, m_pPath->m_strPath.GetLength())); // "test.txt" for "c:\windows\test.txt" return TSmartPath(); } @@ -968,7 +968,7 @@ if(EndsWithSeparator()) { PrepareToWrite(); - m_pPath->m_strPath.DeleteChar(m_pPath->m_strPath.GetLength() - 1); + m_pPath->m_strPath.Delete(m_pPath->m_strPath.GetLength() - 1, 1); } } @@ -1018,7 +1018,7 @@ { PrepareToWrite(); - m_pPath->m_strPath.DeleteChar(0); + m_pPath->m_strPath.Delete(0, 1); } }