Changeset 36527 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Apr 4, 2011 1:16:09 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70949

Message:

iprt::MiniString -> RTCString.

File:

• trunk/src/VBox/Runtime/common/string/ministring.cpp (modified) (24 diffs)

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -33 +33 @@
 *******************************************************************************/
 #include <iprt/cpp/ministring.h>
-using namespace iprt;
 
 
@@ -39 +38 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-const size_t MiniString::npos = ~(size_t)0;
+const size_t RTCString::npos = ~(size_t)0;
+
 
 /*******************************************************************************
@@ -48 +48 @@
 
 
-MiniString &MiniString::printf(const char *pszFormat, ...)
+RTCString &RTCString::printf(const char *pszFormat, ...)
 {
     va_list va;
@@ -58 +58 @@
 
 /**
- * Callback used with RTStrFormatV by MiniString::printfV.
+ * Callback used with RTStrFormatV by RTCString::printfV.
  *
  * @returns The number of bytes added (not used).
@@ -67 +67 @@
  */
 /*static*/ DECLCALLBACK(size_t)
-MiniString::printfOutputCallback(void *pvArg, const char *pachChars, size_t cbChars)
-{
-    MiniString *pThis = (MiniString *)pvArg;
+RTCString::printfOutputCallback(void *pvArg, const char *pachChars, size_t cbChars)
+{
+    RTCString *pThis = (RTCString *)pvArg;
     if (cbChars)
     {
@@ -94 +94 @@
 }
 
-MiniString &MiniString::printfV(const char *pszFormat, va_list va)
+RTCString &RTCString::printfV(const char *pszFormat, va_list va)
 {
     cleanup();
@@ -101 +101 @@
 }
 
-MiniString &MiniString::append(const MiniString &that)
+RTCString &RTCString::append(const RTCString &that)
 {
     size_t cchThat = that.length();
@@ -125 +125 @@
 }
 
-MiniString &MiniString::append(const char *pszThat)
+RTCString &RTCString::append(const char *pszThat)
 {
     size_t cchThat = strlen(pszThat);
@@ -149 +149 @@
 }
 
-MiniString& MiniString::append(char ch)
+RTCString& RTCString::append(char ch)
 {
     Assert((unsigned char)ch < 0x80);                  /* Don't create invalid UTF-8. */
@@ -170 +170 @@
 }
 
-MiniString &MiniString::appendCodePoint(RTUNICP uc)
+RTCString &RTCString::appendCodePoint(RTUNICP uc)
 {
     /*
@@ -176 +176 @@
      */
     if (uc < 0x80)
-        return MiniString::append((char)uc);
+        return RTCString::append((char)uc);
 
     /*
@@ -200 +200 @@
 }
 
-size_t MiniString::find(const char *pcszFind, size_t pos /*= 0*/) const
+size_t RTCString::find(const char *pcszFind, size_t pos /*= 0*/) const
 {
     const char *pszThis, *p;
@@ -213 +213 @@
 }
 
-void MiniString::findReplace(char cFind, char cReplace)
+void RTCString::findReplace(char cFind, char cReplace)
 {
     for (size_t i = 0; i < length(); ++i)
@@ -223 +223 @@
 }
 
-MiniString MiniString::substrCP(size_t pos /*= 0*/, size_t n /*= npos*/) const
-{
-    MiniString ret;
+RTCString RTCString::substrCP(size_t pos /*= 0*/, size_t n /*= npos*/) const
+{
+    RTCString ret;
 
     if (n)
@@ -271 +271 @@
 }
 
-bool MiniString::endsWith(const MiniString &that, CaseSensitivity cs /*= CaseSensitive*/) const
+bool RTCString::endsWith(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const
 {
     size_t l1 = length();
@@ -289 +289 @@
 }
 
-bool MiniString::startsWith(const MiniString &that, CaseSensitivity cs /*= CaseSensitive*/) const
+bool RTCString::startsWith(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const
 {
     size_t l1 = length();
@@ -304 +304 @@
 }
 
-bool MiniString::contains(const MiniString &that, CaseSensitivity cs /*= CaseSensitive*/) const
+bool RTCString::contains(const RTCString &that, CaseSensitivity cs /*= CaseSensitive*/) const
 {
     /** @todo r-bird: Not checking for NULL strings like startsWith does (and
@@ -313 +313 @@
 }
 
-int MiniString::toInt(uint64_t &i) const
+int RTCString::toInt(uint64_t &i) const
 {
     if (!m_psz)
@@ -320 +320 @@
 }
 
-int MiniString::toInt(uint32_t &i) const
+int RTCString::toInt(uint32_t &i) const
 {
     if (!m_psz)
@@ -327 +327 @@
 }
 
-iprt::list<iprt::MiniString, iprt::MiniString *>
-MiniString::split(const iprt::MiniString &a_rstrSep, SplitMode mode /* = RemoveEmptyParts */)
-{
-    iprt::list<iprt::MiniString> strRet;
+iprt::list<RTCString, RTCString *>
+RTCString::split(const RTCString &a_rstrSep, SplitMode mode /* = RemoveEmptyParts */)
+{
+    iprt::list<RTCString> strRet;
     if (!m_psz)
         return strRet;
     if (a_rstrSep.isEmpty())
     {
-        strRet.append(iprt::MiniString(m_psz));
+        strRet.append(RTCString(m_psz));
         return strRet;
     }
@@ -346 +346 @@
         if (!pszNext)
         {
-            strRet.append(iprt::MiniString(pszTmp, cch));
+            strRet.append(RTCString(pszTmp, cch));
             break;
         }
@@ -352 +352 @@
         if (   cchNext > 0
             || mode == KeepEmptyParts)
-            strRet.append(iprt::MiniString(pszTmp, cchNext));
+            strRet.append(RTCString(pszTmp, cchNext));
         pszTmp += cchNext + a_rstrSep.length();
         cch    -= cchNext + a_rstrSep.length();
@@ -361 +361 @@
 
 /* static */
-iprt::MiniString
-MiniString::join(const iprt::list<iprt::MiniString, iprt::MiniString*> &a_rList,
-                 const iprt::MiniString &a_rstrSep /* = "" */)
-{
-    MiniString strRet;
+RTCString
+RTCString::join(const iprt::list<RTCString, RTCString*> &a_rList,
+                 const RTCString &a_rstrSep /* = "" */)
+{
+    RTCString strRet;
     if (a_rList.size() > 1)
     {
@@ -376 +376 @@
 }
 
-const iprt::MiniString operator+(const iprt::MiniString &a_rStr1, const iprt::MiniString &a_rStr2)
-{
-    iprt::MiniString strRet(a_rStr1);
+const RTCString operator+(const RTCString &a_rStr1, const RTCString &a_rStr2)
+{
+    RTCString strRet(a_rStr1);
     strRet += a_rStr2;
     return strRet;
 }
 
-const iprt::MiniString operator+(const iprt::MiniString &a_rStr1, const char *a_pszStr2)
-{
-    iprt::MiniString strRet(a_rStr1);
+const RTCString operator+(const RTCString &a_rStr1, const char *a_pszStr2)
+{
+    RTCString strRet(a_rStr1);
     strRet += a_pszStr2;
     return strRet;
 }
 
-const iprt::MiniString operator+(const char *a_psz1, const iprt::MiniString &a_rStr2)
-{
-    iprt::MiniString strRet(a_psz1);
+const RTCString operator+(const char *a_psz1, const RTCString &a_rStr2)
+{
+    RTCString strRet(a_psz1);
     strRet += a_rStr2;
     return strRet;