Changeset 30746 in vbox for trunk/include/iprt/cpp

Timestamp:

Jul 8, 2010 4:42:49 PM (15 years ago)

Author:

vboxsync

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

63518

Message:

Main: clean up spaghetti code in Console::configConstructor(): remove RC_CHECK() macro and delegate error handling to a few shared functions; move XML exceptions to separate header in IPRT to allow for reuse

Location:

trunk/include/iprt/cpp

Files:

• utils.h (modified) (1 diff)
• xml.h (modified) (4 diffs)

trunk/include/iprt/cpp/utils.h

@@ -64 +64 @@
 namespace iprt
 {
+
 /**
  * A simple class used to prevent copying and assignment.  Inherit from this

trunk/include/iprt/cpp/xml.h

@@ -34 +34 @@
 #include <memory>
 
-#include <iprt/cpp/ministring.h>
+#include <iprt/cpp/exception.h>
 
 /* Forwards */
@@ -53 +53 @@
 //////////////////////////////////////////////////////////////////////////////
 
-/**
- * Base exception class.
- */
-class RT_DECL_CLASS Error : public std::exception
-{
-public:
-
-    Error(const char *pcszMessage)
-        : m_s(pcszMessage)
-    {
-    }
-
-    Error(const Error &s)
-        : std::exception(s),
-          m_s(s.what())
-    {
-    }
-
-    virtual ~Error() throw()
-    {
-    }
-
-    void operator=(const Error &s)
-    {
-        m_s = s.what();
-    }
-
-    void setWhat(const char *pcszMessage)
-    {
-        m_s = pcszMessage;
-    }
-
-    virtual const char* what() const throw()
-    {
-        return m_s.c_str();
-    }
-
-private:
-    // hide the default constructor to make sure the extended one above is always used
-    Error();
-
-    iprt::MiniString m_s;
-};
-
-class RT_DECL_CLASS LogicError : public Error
+class RT_DECL_CLASS LogicError : public iprt::Error
 {
 public:
 
     LogicError(const char *aMsg = NULL)
-        : xml::Error(aMsg)
+        : iprt::Error(aMsg)
     {}
 
@@ -108 +64 @@
 };
 
-class RT_DECL_CLASS RuntimeError : public Error
+class RT_DECL_CLASS RuntimeError : public iprt::Error
 {
 public:
 
     RuntimeError(const char *aMsg = NULL)
-        : xml::Error(aMsg)
+        : iprt::Error(aMsg)
     {}
 };
@@ -173 +129 @@
     int mRC;
 };
-
 
 /**