From: Bart A.M. Jourquin Date: Thu, 27 Jan 2000 08:54:44 +0000 (+0000) Subject: Using P.Getchar(i) instead of p[i] X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b2f60e03ccc39fc15ad9673dad7b27b86c42996f Using P.Getchar(i) instead of p[i] git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 120cfc28f0..ebefb2ef97 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -230,33 +230,33 @@ static wxString MakeCorrectPath(const wxString& path) cnt = p.Length(); for (i = 0; i < cnt; i++) - if (p[i] == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // wanna be windows-safe + if (p.GetChar(i) == wxT('\\')); p.GetWritableChar(i) = wxT('/'); // wanna be windows-safe if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; } if (cnt < 3) return p; - r << p[0] << p[1]; + r << p.GetChar(0) << p.GetChar(1); // skip trailing ../.., if any - for (i = 2; i < cnt && (p[i] == wxT('/') || p[i] == wxT('.')); i++) r << p[i]; + for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i); // remove back references: translate dir1/../dir2 to dir2 for (; i < cnt; i++) { - r << p[i]; - if (p[i] == wxT('/') && p[i-1] == wxT('.') && p[i-2] == wxT('.')) + r << p.GetChar(i); + if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.')) { - for (j = r.Length() - 2; j >= 0 && r[j] != wxT('/') && r[j] != wxT(':'); j--) {} - if (j >= 0 && r[j] != wxT(':')) + for (j = r.Length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {} + if (j >= 0 && r.GetChar(j) != wxT(':')) { - for (j = j - 1; j >= 0 && r[j] != wxT('/') && r[j] != wxT(':'); j--) {} + for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {} r.Remove(j + 1); } } } - for (; i < cnt; i++) r << p[i]; + for (; i < cnt; i++) r << p.GetChar(i); return r; } diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index 53af80cad7..8d295d4677 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -87,7 +87,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri // fix malformed url: if (myloc.Left(2) != wxT("//")) { - if (myloc[0] != wxT('/')) myloc = wxT("//") + myloc; + if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc; else myloc = wxT("/") + myloc; } if (myloc.Mid(2).Find(wxT('/')) == wxNOT_FOUND) myloc << wxT('/');