Changeset 19530 in vbox

Timestamp:

May 8, 2009 2:39:23 PM (16 years ago)

Author:

vboxsync

Message:

Main: decouple xml classes from COM dependencies (part 2)

Location:

trunk

Files:

• include/VBox/xml.h (modified) (2 diffs)
• src/VBox/Main/xml/xml.cpp (modified) (2 diffs)

trunk/include/VBox/xml.h

@@ -54 +54 @@
 #endif
 
-#include "VBox/com/string.h"
-
 /*
  * Shut up MSVC complaining that auto_ptr[_ref] template instantiations (as a
@@ -92 +90 @@
 {
 
+// Little string class for XML only
+//////////////////////////////////////////////////////////////////////////////
+
+class ministring
+{
+public:
+    ministring()
+        : m_psz(NULL)
+    {
+    }
+
+    ministring(const ministring &s)
+        : m_psz(NULL)
+    {
+        copyFrom(s.c_str());
+    }
+
+    ministring(const char *pcsz)
+        : m_psz(NULL)
+    {
+        copyFrom(pcsz);
+    }
+
+    ~ministring()
+    {
+        cleanup();
+    }
+
+    void operator=(const char *pcsz)
+    {
+        cleanup();
+        copyFrom(pcsz);
+    }
+
+    void operator=(const ministring &s)
+    {
+        cleanup();
+        copyFrom(s.c_str());
+    }
+
+    const char* c_str() const
+    {
+        return m_psz;
+    }
+
+private:
+    void cleanup()
+    {
+        if (m_psz)
+        {
+            RTStrFree(m_psz);
+            m_psz = NULL;
+        }
+    }
+
+    void copyFrom(const char *pcsz)
+    {
+        if (pcsz)
+            m_psz = RTStrDup(pcsz);
+    }
+
+
+    char *m_psz;
+};
+
 // Exceptions
 //////////////////////////////////////////////////////////////////////////////

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

@@ -1081 +1081 @@
 {
     xmlParserCtxtPtr ctxt;
-    com::Utf8Str strXmlFilename;
+    ministring strXmlFilename;
 
     Data()
@@ -1111 +1111 @@
 {
     File file;
-    com::Utf8Str error;
+    ministring error;
 
     IOContext(const char *pcszFilename, File::Mode mode)