Changeset 21435 in vbox for trunk/include

Timestamp:

Jul 9, 2009 12:23:15 PM (16 years ago)

Author:

vboxsync

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

49830

Message:

Main: teach Bstr to convert from a MiniString as well as Utf8Str

File:

• trunk/include/VBox/com/string.h (modified) (2 diffs)

trunk/include/VBox/com/string.h

@@ -91 +91 @@
 #endif
 
-    Bstr (const Utf8Str &that);
+    Bstr (const iprt::MiniString &that);
     Bstr (const char *that);
 
@@ -601 +601 @@
 // inlined Bstr members that depend on Utf8Str
 
-inline Bstr::Bstr (const Utf8Str &that) : bstr (NULL) { raw_copy (bstr, that); }
-inline Bstr::Bstr (const char *that) : bstr (NULL) { raw_copy (bstr, that); }
-
-inline Bstr &Bstr::operator = (const Utf8Str &that)
+inline Bstr::Bstr(const iprt::MiniString &that)
+    : bstr(NULL)
+{
+    raw_copy(bstr, that.c_str());
+}
+
+inline Bstr::Bstr(const char *that)
+    : bstr(NULL)
+{
+    raw_copy(bstr, that);
+}
+
+inline Bstr &Bstr::operator=(const Utf8Str &that)
 {
     setNull();
-    raw_copy (bstr, that);
+    raw_copy(bstr, that);
     return *this;
 }
-inline Bstr &Bstr::operator = (const char *that)
+inline Bstr &Bstr::operator=(const char *that)
 {
     setNull();
-    raw_copy (bstr, that);
+    raw_copy(bstr, that);
     return *this;
 }