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 120cfc28f0da11efabbc12ffc1d3e2dbb0bad2d0..ebefb2ef975aae05234b55210e09636b376318f3 100644 (file)
--- 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++)
     
     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;
     
         
     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
     
     // 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++)
     {
     
     // 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);
             }
         }
     }
         
                 r.Remove(j + 1);
             }
         }
     }
         

-    for (; i < cnt; i++) r << p[i];
+    for (; i < cnt; i++) r << p.GetChar(i);

         
     return r;
 }
         
     return r;
 }

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 53af80cad706436f88f5e02604f4f73df8ec53e7..8d295d4677376326b449a754f0dd0003f0f5c295 100644 (file)
--- 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("//")) 
     {
     // 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('/');
         else myloc = wxT("/") + myloc;
     }
     if (myloc.Mid(2).Find(wxT('/')) == wxNOT_FOUND) myloc << wxT('/');