Changeset 21409 in vbox for trunk

Timestamp:

Jul 8, 2009 3:36:59 PM (16 years ago)

Author:

vboxsync

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

49785

Message:

IPRT: rename ministring, add iprt:: namespace

Location:

trunk

Files:

• include/VBox/com/string.h (modified) (4 diffs)
• include/iprt/ministring_cpp.h (modified) (13 diffs)
• include/iprt/xml_cpp.h (modified) (1 diff)
• src/VBox/Runtime/r3/xml.cpp (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstUtf8.cpp (modified) (5 diffs)

trunk/include/VBox/com/string.h

@@ -324 +324 @@
  *    afterwards.
  */
-class Utf8Str : public ministring
+class Utf8Str : public iprt::MiniString
 {
 public:
@@ -331 +331 @@
 
     Utf8Str(const Utf8Str &that)
-        : ministring(that)
+        : MiniString(that)
     {}
 
     Utf8Str(const char *that)
-        : ministring(that)
+        : MiniString(that)
     {}
 
@@ -350 +350 @@
     Utf8Str& operator=(const Utf8Str &that)
     {
-        ministring::operator=(that);
+        MiniString::operator=(that);
         return *this;
     }
@@ -356 +356 @@
     Utf8Str& operator=(const char *that)
     {
-        ministring::operator=(that);
+        MiniString::operator=(that);
         return *this;
     }

trunk/include/iprt/ministring_cpp.h

@@ -37 +37 @@
 #include <new>
 
+namespace iprt
+{
+
 /**
- *  "ministring" is a small C++ string class that does not depend on anything
+ *  "MiniString" is a small C++ string class that does not depend on anything
  *  else except IPRT memory management functions. This is used as the base of
  *  both the Utf8Str class that COM uses as well as C++ code in IPRT that
@@ -46 +49 @@
  *
  *  Much of the code in here used to be in com::Utf8Str so that com::Utf8Str
- *  can now derive from ministring and only contain code that is COM-specific,
- *  such as com::Bstr conversions. Compared to the old Utf8Str though, ministring
+ *  can now derive from MiniString and only contain code that is COM-specific,
+ *  such as com::Bstr conversions. Compared to the old Utf8Str though, MiniString
  *  always knows the length of its member string and the size of the buffer
  *  so it can use memcpy() instead of strdup().
  */
 
-class RT_DECL_CLASS ministring
+class RT_DECL_CLASS MiniString
 {
 public:
@@ -58 +61 @@
      * Creates an empty string that has no memory allocated.
      */
-    ministring()
+    MiniString()
         : m_psz(NULL),
           m_cbLength(0),
@@ -66 +69 @@
 
     /**
-     * Creates a copy of another ministring. This allocates
+     * Creates a copy of another MiniString. This allocates
      * s.length() + 1 bytes for the new instance.
      * @param s
      */
-    ministring(const ministring &s)
+    MiniString(const MiniString &s)
     {
         copyFrom(s);
@@ -76 +79 @@
 
     /**
-     * Creates a copy of another ministring. This allocates
+     * Creates a copy of another MiniString. This allocates
      * strlen(pcsz) + 1 bytes for the new instance.
      * @param pcsz
      */
-    ministring(const char *pcsz)
+    MiniString(const char *pcsz)
     {
         copyFrom(pcsz);
@@ -88 +91 @@
      * Destructor.
      */
-    virtual ~ministring()
+    virtual ~MiniString()
     {
         cleanup();
@@ -149 +152 @@
      *          capacity() to find out how large that buffer is.
      *      2)  After any operation that modifies the length of the string,
-     *          you _must_ call ministring::jolt(), or subsequent copy operations
+     *          you _must_ call MiniString::jolt(), or subsequent copy operations
      *          may go nowhere. Better not use mutableRaw() at all.
      */
@@ -182 +185 @@
      * @return
      */
-    ministring& operator=(const char *pcsz)
+    MiniString& operator=(const char *pcsz)
     {
         if (m_psz != pcsz)
@@ -197 +200 @@
      * @return
      */
-    ministring& operator=(const ministring &s)
+    MiniString& operator=(const MiniString &s)
     {
         if (this != &s)
@@ -211 +214 @@
      * @param that
      */
-    void append(const ministring &that)
+    void append(const MiniString &that)
     {
         size_t cbThis = length();
@@ -290 +293 @@
     }
 
-    int compare(const ministring &that, CaseSensitivity cs = CaseSensitive) const
+    int compare(const MiniString &that, CaseSensitivity cs = CaseSensitive) const
     {
         return compare(that.m_psz, cs);
     }
 
-    bool operator==(const ministring &that) const { return !compare(that); }
-    bool operator!=(const ministring &that) const { return !!compare(that); }
-    bool operator<(const ministring &that) const { return compare(that) < 0; }
-    bool operator>(const ministring &that) const { return compare(that) > 0; }
+    bool operator==(const MiniString &that) const { return !compare(that); }
+    bool operator!=(const MiniString &that) const { return !!compare(that); }
+    bool operator<(const MiniString &that) const { return compare(that) < 0; }
+    bool operator>(const MiniString &that) const { return compare(that) > 0; }
 
     bool operator==(const char *that) const { return !compare(that); }
@@ -335 +338 @@
      * after having called cleanup().
      *
-     * This variant copies from another ministring and is fast since
+     * This variant copies from another MiniString and is fast since
      * the length of source string is known.
      *
      * @param s
      */
-    void copyFrom(const ministring &s)
+    void copyFrom(const MiniString &s)
     {
         if ((m_cbLength = s.m_cbLength))
@@ -394 +397 @@
 };
 
+} // namespace iprt
+
 #endif

trunk/include/iprt/xml_cpp.h

@@ -94 +94 @@
     Error() {};     // hide the default constructor to make sure the extended one above is always used
 
-    ministring m_s;
+    iprt::MiniString m_s;
 };
 

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -1085 +1085 @@
 {
     xmlParserCtxtPtr ctxt;
-    ministring strXmlFilename;
+    iprt::MiniString strXmlFilename;
 
     Data()
@@ -1115 +1115 @@
 {
     File file;
-    ministring error;
+    iprt::MiniString error;
 
     IOContext(const char *pcszFilename, File::Mode mode)

trunk/src/VBox/Runtime/testcase/tstUtf8.cpp

@@ -949 +949 @@
     } while (0)
 
-    ministring empty;
+    iprt::MiniString empty;
     CHECK( (empty.length() == 0) );
     CHECK( (empty.capacity() == 0) );
 
-    ministring sixbytes("12345");
+    iprt::MiniString sixbytes("12345");
     CHECK( (sixbytes.length() == 5) );
     CHECK( (sixbytes.capacity() == 6) );
@@ -970 +970 @@
     CHECK( (sixbytes.capacity() == 7) );
 
-    ministring morebytes("tobereplaced");
+    iprt::MiniString morebytes("tobereplaced");
     morebytes = "newstring ";
     morebytes.append(sixbytes);
@@ -976 +976 @@
     CHECK_DUMP( (morebytes == "newstring 123456"), morebytes.c_str() );
 
-    ministring third(morebytes);
+    iprt::MiniString third(morebytes);
     third.reserve(100 * 1024);      // 100 KB
     CHECK_DUMP( (third == "newstring 123456"), morebytes.c_str() );
@@ -982 +982 @@
     CHECK( (third.length() == morebytes.length()) );        // must not have changed
 
-    ministring copy1(morebytes);
-    ministring copy2 = morebytes;
+    iprt::MiniString copy1(morebytes);
+    iprt::MiniString copy2 = morebytes;
     CHECK( (copy1 == copy2) );
 
@@ -992 +992 @@
     CHECK( (copy1.length() == 0) );
 
-    CHECK( (ministring("abc") < ministring("def")) );
-    CHECK( (ministring("abc") != ministring("def")) );
-    CHECK_DUMP_I( (ministring("def") > ministring("abc")) );
+    CHECK( (iprt::MiniString("abc") < iprt::MiniString("def")) );
+    CHECK( (iprt::MiniString("abc") != iprt::MiniString("def")) );
+    CHECK_DUMP_I( (iprt::MiniString("def") > iprt::MiniString("abc")) );
 
     copy2.setNull();