Changeset 16538 in vbox for trunk/include/VBox

Timestamp:

Feb 5, 2009 11:25:01 PM (16 years ago)

Author:

vboxsync

Message:

Main: replace redundant xml::FmtStr with com::Utf8StrFmt

Location:

trunk/include/VBox

Files:

• settings.h (modified) (4 diffs)
• xml.h (modified) (1 diff)

trunk/include/VBox/settings.h

@@ -47 +47 @@
 #include <VBox/xml.h>
 
-#include <stdarg.h>
+// #include <stdarg.h>
 
 
@@ -592 +592 @@
         catch (const ENoValue &)
         {
-            throw ENoValue(xml::FmtStr("No such attribute '%s'", aName));
+            throw ENoValue(com::Utf8StrFmt("No such attribute '%s'", aName));
         }
     }
@@ -647 +647 @@
         catch (const ENoValue &)
         {
-            throw ENoValue(xml::FmtStr("No value for attribute '%s'", aName));
+            throw ENoValue(com::Utf8StrFmt("No value for attribute '%s'", aName));
         }
     }
@@ -761 +761 @@
         if (key.isNull())
         {
-            throw ENoKey(xml::FmtStr("No such key '%s'", aName));
+            throw ENoKey(com::Utf8StrFmt("No such key '%s'", aName));
         }
         return key;

trunk/include/VBox/xml.h

@@ -101 +101 @@
 {
 
-// Helpers
-//////////////////////////////////////////////////////////////////////////////
-
-/**
- * Temporary holder for the formatted string.
- *
- * Instances of this class are used for passing the formatted string as an
- * argument to an Error constructor or to another function that takes
- * <tr>const char *</tr> and makes a copy of the string it points to.
- */
-class VBOXXML_CLASS FmtStr
-{
-public:
-
-    /**
-     * Creates a formatted string using the format string and a set of
-     * printf-like arguments.
-     */
-    FmtStr(const char *aFmt, ...)
-    {
-        va_list args;
-        va_start(args, aFmt);
-        RTStrAPrintfV(&mStr, aFmt, args);
-        va_end(args);
-    }
-
-    ~FmtStr() { RTStrFree (mStr); }
-
-    operator const char *() { return mStr; }
-
-private:
-
-    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP (FmtStr)
-
-    char *mStr;
-};
-
-
 // Exceptions
 //////////////////////////////////////////////////////////////////////////////