[cstdstring] remove GetAt()

diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index 7f8ea59..99ac881 100644 (file)
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -3051,7 +3051,7 @@ bool CFileItem::LoadMusicTag()
     if (iTrack >= 1)
     {
       CStdString strText = g_localizeStrings.Get(554); // "Track"
-      if (strText.GetAt(strText.size() - 1) != ' ')
+      if (!strText.empty() && strText[strText.size() - 1] != ' ')
         strText += " ";
       CStdString strTrack = StringUtils::Format(strText + "%i", iTrack);
       GetMusicInfoTag()->SetTitle(strTrack);

diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 1ca8b5b..576f740 100644 (file)
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -283,16 +283,16 @@ void CUtil::CleanString(const CStdString& strFileName, CStdString& strTitle, CSt
     bool initialDots = true;
     bool alreadyContainsSpace = (strTitleAndYear.find(' ') != std::string::npos);
 
-    for (int i = 0; i < (int)strTitleAndYear.size(); i++)
+    for (size_t i = 0; i < strTitleAndYear.size(); i++)
     {
-      char c = strTitleAndYear.GetAt(i);
+      char c = strTitleAndYear[i];
 
       if (c != '.')
         initialDots = false;
 
       if ((c == '_') || ((!alreadyContainsSpace) && !initialDots && (c == '.')))
       {
-        strTitleAndYear.SetAt(i, ' ');
+        strTitleAndYear[i] = ' ';
       }
     }
   }

diff --git a/xbmc/network/linux/NetworkLinux.cpp b/xbmc/network/linux/NetworkLinux.cpp
index 9e54915..9c4a8d6 100644 (file)
--- a/xbmc/network/linux/NetworkLinux.cpp
+++ b/xbmc/network/linux/NetworkLinux.cpp
@@ -920,7 +920,7 @@ void CNetworkInterfaceLinux::GetSettings(NetworkAssignment& assignment, CStdStri
       StringUtils::TrimRight(s," \n");
 
       // skip comments
-      if (s.length() == 0 || s.GetAt(0) == '#')
+      if (s.empty() || s[0] == '#')
          continue;
 
       // look for "iface <interface name> inet"
@@ -1006,7 +1006,7 @@ void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdStri
       StringUtils::TrimRight(s," \n");
 
       // skip comments
-      if (!foundInterface && (s.length() == 0 || s.GetAt(0) == '#'))
+      if (!foundInterface && (s.empty() || s[0] == '#'))
       {
         fprintf(fw, "%s", line);
         continue;

diff --git a/xbmc/utils/StdString.h b/xbmc/utils/StdString.h
index 3c6e662..662cdca 100644 (file)
--- a/xbmc/utils/StdString.h
+++ b/xbmc/utils/StdString.h
@@ -2611,11 +2611,6 @@ public:
   // -------------------------------------------------------------------------
   // GetXXXX -- Direct access to character buffer
   // -------------------------------------------------------------------------
-  CT GetAt(int nIdx) const
-  {
-    return this->at(static_cast<MYSIZE>(nIdx));
-  }
-
   CT* GetBuffer(int nMinLen=-1)
   {
     return GetBuf(nMinLen);
@@ -2643,12 +2638,6 @@ public:
     RelBuf(nNewLen);
   }
 
-  void SetAt(int nIndex, CT ch)
-  {
-    ASSERT(this->size() > static_cast<MYSIZE>(nIndex));
-    this->at(static_cast<MYSIZE>(nIndex))    = ch;
-  }
-
 #ifndef SS_ANSI
   BSTR SetSysString(BSTR* pbstr) const
   {