Changeset 14922 in vbox for trunk/include

Timestamp:

Dec 2, 2008 5:39:34 PM (16 years ago)

Author:

vboxsync

Message:

Main: more XML reader implemenation.

Location:

trunk/include/VBox

Files:

• settings.h (modified) (3 diffs)
• xml.h (modified) (6 diffs)

trunk/include/VBox/settings.h

@@ -794 +794 @@
         Key key = findKey (aName);
         if (key.isNull())
-            throw ENoKey (FmtStr ("No such key '%s'", aName));
+        {
+            throw ENoKey(FmtStr("No such key '%s'", aName));
+        }
         return key;
     }
@@ -1015 +1017 @@
 
     /**
-     * The Error class represents errors that may happen when parsing or
-     * validating the XML document representing the settings tree.
-     */
-    class VBOXXML_CLASS Error : public xml::RuntimeError
-    {
-    public:
-
-        Error (const char *aMsg = NULL) : RuntimeError (aMsg) {}
-    };
-
-    /**
      * The EConversionCycle class represents a conversion cycle detected by the
      * AutoConverter::needsConversion() implementation.
      */
-    class VBOXXML_CLASS EConversionCycle : public Error
+    class VBOXXML_CLASS EConversionCycle : public xml::RuntimeError
     {
     public:
 
-        EConversionCycle (const char *aMsg = NULL) : Error (aMsg) {}
+        EConversionCycle (const char *aMsg = NULL) : RuntimeError (aMsg) {}
     };
 
@@ -1183 +1174 @@
 private:
 
-    class XmlError;
-
     /* Obscure class data */
     struct Data;

trunk/include/VBox/xml.h

@@ -110 +110 @@
 public:
 
-    Error (const char *aMsg = NULL)
+    Error(const char *aMsg = NULL)
         : m (aMsg ? Str::New (aMsg) : NULL) {}
 
@@ -120 +120 @@
 
 private:
+
+    Error() {};     // hide the default constructor to make sure the extended one above is always used
 
     /** smart string with support for reference counting */
@@ -148 +150 @@
 public:
 
-    LogicError (const char *aMsg = NULL) : Error (aMsg) {}
+    LogicError (const char *aMsg = NULL)
+        : xml::Error(aMsg)
+    {}
 
     LogicError (RT_SRC_POS_DECL);
@@ -158 +162 @@
 
     RuntimeError (const char *aMsg = NULL) : Error (aMsg) {}
+};
+
+class VBOXXML_CLASS XmlError : public RuntimeError
+{
+public:
+
+    XmlError(xmlErrorPtr aErr);
+
+    static char *Format(xmlErrorPtr aErr);
 };
 
@@ -194 +207 @@
 public:
 
-    EIPRTFailure (const char *aMsg = NULL) : RuntimeError (aMsg) {}
-
-    EIPRTFailure (int aRC) : mRC (aRC) {}
+    EIPRTFailure (int aRC);
+
     int rc() const { return mRC; }
 
 private:
-
     int mRC;
 };
@@ -466 +477 @@
     std::auto_ptr<Data> m;
 
+    static int ReadCallback(void *aCtxt, char *aBuf, int aLen);
+
+    static int CloseCallback (void *aCtxt);
 };