Changeset 19519 in vbox for trunk/include/VBox

Timestamp:

May 8, 2009 12:38:07 PM (16 years ago)

Author:

vboxsync

Message:

Main: decouple xml classes from COM dependencies

File:

• trunk/include/VBox/xml.h (modified) (4 diffs)

trunk/include/VBox/xml.h

@@ -102 +102 @@
 public:
 
-    Error(const char *aMsg = NULL)
-        : m(aMsg) {}
-
-    virtual ~Error() throw() {}
-
-    void setWhat (const char *aMsg) { m = aMsg; }
-
-    const char* what() const throw() { return m.c_str(); }
-
-private:
-
-//     Error() {};     // hide the default constructor to make sure the extended one above is always used
-
-    com::Utf8Str m;
+    Error(const char *pcszMessage = NULL)
+        : m_pcsz(NULL)
+    {
+        copyFrom(pcszMessage);
+    }
+
+    Error(const Error &s)
+        : std::exception(s)
+    {
+        copyFrom(s.what());
+    }
+
+    virtual ~Error() throw()
+    {
+        cleanup();
+    }
+
+    void operator=(const Error &s)
+    {
+        cleanup();
+        copyFrom(s.what());
+    }
+
+    void setWhat(const char *pcszMessage)
+    {
+        cleanup();
+        copyFrom(pcszMessage);
+    }
+
+    virtual const char* what() const throw()
+    {
+        return m_pcsz;
+    }
+
+private:
+    Error() {};     // hide the default constructor to make sure the extended one above is always used
+
+    void cleanup()
+    {
+        if (m_pcsz)
+        {
+            RTStrFree(m_pcsz);
+            m_pcsz = NULL;
+        }
+    }
+
+    void copyFrom(const char *pcszMessage)
+    {
+        if (pcszMessage)
+            m_pcsz = RTStrDup(pcszMessage);
+    }
+
+    char *m_pcsz;
 };
 
@@ -122 +161 @@
 public:
 
-    LogicError (const char *aMsg = NULL)
+    LogicError(const char *aMsg = NULL)
         : xml::Error(aMsg)
     {}
 
-    LogicError (RT_SRC_POS_DECL);
+    LogicError(RT_SRC_POS_DECL);
 };
 
@@ -133 +172 @@
 public:
 
-    RuntimeError (const char *aMsg = NULL) : Error (aMsg) {}
+    RuntimeError(const char *aMsg = NULL)
+        : xml::Error(aMsg)
+    {}
 };
 
@@ -498 +539 @@
 
     const AttributeNode* findAttribute(const char *pcszMatch) const;
-    bool getAttributeValue(const char *pcszMatch, com::Utf8Str &str) const;
+    bool getAttributeValue(const char *pcszMatch, const char *&ppcsz) const;
     bool getAttributeValue(const char *pcszMatch, int64_t &i) const;
     bool getAttributeValue(const char *pcszMatch, uint64_t &i) const;