Changeset 21077 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jun 30, 2009 3:19:12 PM (15 years ago)

Author:

vboxsync

Message:

back out r49329, r49331, will start over

Location:

trunk/src/VBox/Main/glue

Files:

• ErrorInfo.cpp (modified) (2 diffs)
• VirtualBoxErrorInfo.cpp (modified) (1 diff)
• string.cpp (modified) (3 diffs)

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -118 +118 @@
 
                     Utf8Str message;
-                    rc = ex->GetMessage(message.asOutParam());
-                    message.jolt();
+                    rc = ex->GetMessage (message.asOutParam());
                     gotSomething |= NS_SUCCEEDED (rc);
                     if (NS_SUCCEEDED (rc))
@@ -183 +182 @@
     LONG lrc;
 
-    rc = info->COMGETTER(ResultCode) (&lrc); mResultCode = lrc;
+    rc = info->COMGETTER(ResultCode) (&lrc); mResultCode = lrc;    
     gotSomething |= SUCCEEDED (rc);
     gotAll &= SUCCEEDED (rc);

trunk/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp

@@ -179 +179 @@
     AssertComRC (rc);
     Utf8Str message;
-    rc = aInfo->GetMessage(message.asOutParam());
-    message.jolt();
+    rc = aInfo->GetMessage (message.asOutParam());
     AssertComRC (rc);
     mText = message;

trunk/src/VBox/Main/glue/string.cpp

@@ -26 +26 @@
 
 #include <iprt/err.h>
-#include <iprt/path.h>
 
 namespace com
@@ -86 +85 @@
 
                 size_t cbCopy = psz - pFirst;
-                ret.reserve(cbCopy + 1);
-                memcpy(ret.m_psz, pFirst, cbCopy);
-                ret.m_psz[cbCopy] = '\0';
+                ret.alloc(cbCopy + 1);
+                memcpy(ret.str, pFirst, cbCopy);
+                ret.str[cbCopy] = '\0';
             }
         }
@@ -96 +95 @@
 }
 
-bool Utf8Str::endsWith(const Utf8Str &that, CaseSensitivity cs /*= CaseSensitive*/) const
-{
-    size_t l1 = length();
-    if (l1 == 0)
-        return false;
-
-    size_t l2 = that.length();
-    if (l1 < l2)
-        return false;
-
-    size_t l = l1 - l2;
-    if (cs == CaseSensitive)
-        return ::RTStrCmp(&m_psz[l], that.m_psz) == 0;
-    else
-        return ::RTStrICmp(&m_psz[l], that.m_psz) == 0;
-}
-
-bool Utf8Str::startsWith(const Utf8Str &that, CaseSensitivity cs /*= CaseSensitive*/) const
-{
-    size_t l1 = length();
-    size_t l2 = that.length();
-    if (l1 == 0 || l2 == 0)
-        return false;
-
-    if (l1 < l2)
-        return false;
-
-    if (cs == CaseSensitive)
-        return ::RTStrNCmp(m_psz, that.m_psz, l2) == 0;
-    else
-        return ::RTStrNICmp(m_psz, that.m_psz, l2) == 0;
-}
-
-bool Utf8Str::contains(const Utf8Str &that, CaseSensitivity cs /*= CaseSensitive*/) const
-{
-    if (cs == CaseSensitive)
-        return ::RTStrStr(m_psz, that.m_psz) != NULL;
-    else
-        return ::RTStrIStr(m_psz, that.m_psz) != NULL;
-}
-
-Utf8Str& Utf8Str::toLower()
-{
-    if (!isEmpty())
-        ::RTStrToLower(m_psz);
-    return *this;
-}
-
-Utf8Str& Utf8Str::toUpper()
-{
-    if (!isEmpty())
-        ::RTStrToUpper(m_psz);
-    return *this;
-}
-
-void Utf8Str::stripTrailingSlash()
-{
-    RTPathStripTrailingSlash(m_psz);
-    jolt();
-}
-
-void Utf8Str::stripFilename()
-{
-    RTPathStripFilename(m_psz);
-    jolt();
-}
-
-void Utf8Str::stripExt()
-{
-    RTPathStripExt(m_psz);
-    jolt();
-}
-
 int Utf8Str::toInt(uint64_t &i) const
 {
-    if (!m_psz)
+    if (!str)
         return VERR_NO_DIGITS;
-    return RTStrToUInt64Ex(m_psz, NULL, 0, &i);
+    return RTStrToUInt64Ex(str, NULL, 0, &i);
 }
 
 int Utf8Str::toInt(uint32_t &i) const
 {
-    if (!m_psz)
+    if (!str)
         return VERR_NO_DIGITS;
-    return RTStrToUInt32Ex(m_psz, NULL, 0, &i);
+    return RTStrToUInt32Ex(str, NULL, 0, &i);
 }