Changeset 33621 in vbox for trunk/src

Timestamp:

Oct 29, 2010 4:15:40 PM (14 years ago)

Author:

vboxsync

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

67232

Message:

Utf8Str: Use printfV in Utf8StrFmt, eliminated Utf8StrFmtVA by replacing it by a Utf8Str(str,va) constructor.

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• ConsoleImpl.cpp (modified) (2 diffs)
• ProgressImpl.cpp (modified) (1 diff)
• VirtualBoxBase.cpp (modified) (3 diffs)
• glue/string.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -819 +819 @@
     va_list args;
     va_start(args, aWarning);
-    Utf8StrFmtVA str(aWarning, args);
+    Utf8Str str(aWarning, args);
     va_end(args);
     m->llWarnings.push_back(str);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3013 +3013 @@
                                   getStaticClassIID(),
                                   getStaticComponentName(),
-                                  Utf8StrFmtVA(pcsz, args),
+                                  Utf8Str(pcsz, args),
                                   false /* aWarning */,
                                   true /* aLogIt */);
@@ -7039 +7039 @@
     AssertReturnVoid(that);
 
-    Utf8Str message = Utf8StrFmtVA(pszFormat, va);
+    Utf8Str message(pszFormat, va);
 
     LogRel(("Console: VM runtime error: fatal=%RTbool, errorID=%s message=\"%s\"\n",

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -1161 +1161 @@
                                   va_list va)
 {
-    Utf8Str text = Utf8StrFmtVA(aText, va);
+    Utf8Str text(aText, va);
 
     AutoCaller autoCaller(this);

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -462 +462 @@
                                   this->getClassIID(),
                                   this->getComponentName(),
-                                  Utf8StrFmtVA(pcsz, args),
+                                  Utf8Str(pcsz, args),
                                   false /* aWarning */,
                                   true /* aLogIt */);
@@ -482 +482 @@
                                   this->getClassIID(),
                                   this->getComponentName(),
-                                  Utf8StrFmtVA(pcsz, args),
+                                  Utf8Str(pcsz, args),
                                   true /* aWarning */,
                                   true /* aLogIt */);
@@ -502 +502 @@
                                   this->getClassIID(),
                                   this->getComponentName(),
-                                  Utf8StrFmtVA(pcsz, args),
+                                  Utf8Str(pcsz, args),
                                   false /* aWarning */,
                                   false /* aLogIt */);

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

@@ -139 +139 @@
 }
 
-void Utf8StrFmt::init(const char *format, va_list args)
-{
-    if (!format || !*format)
-    {
-        m_cch = 0;
-        m_cbAllocated = 0;
-        m_psz = NULL;
-    }
-    else
-    {
-        m_cch = RTStrAPrintfV(&m_psz, format, args);
-        m_cbAllocated = m_cch + 1;
-    }
-}
-
 } /* namespace com */

trunk/src/VBox/Main/xml/Settings.cpp

@@ -189 +189 @@
         va_list args;
         va_start(args, pcszFormat);
-        Utf8StrFmtVA strWhat(pcszFormat, args);
+        Utf8Str strWhat(pcszFormat, args);
         va_end(args);