Changeset 41214 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 8, 2012 5:59:43 PM (13 years ago)

Author:

vboxsync

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

77853

Message:

Main: move handleUnexpectedExceptions method to VirtualBoxBase

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (1 diff)
• ParallelPortImpl.h (modified) (2 diffs)
• SerialPortImpl.h (modified) (2 diffs)
• VirtualBoxBase.h (modified) (1 diff)
• VirtualBoxImpl.h (modified) (1 diff)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -266 +266 @@
     static HRESULT setErrorStatic(HRESULT aResultCode, const char *pcsz, ...);
     HRESULT setInvalidMachineStateError();
-
-    static HRESULT handleUnexpectedExceptions(RT_SRC_POS_DECL);
 
     static const char *convertControllerTypeToDev(StorageControllerType_T enmCtrlType);

trunk/src/VBox/Main/include/ParallelPortImpl.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -85 +85 @@
 };
 
-#endif // ____H_FLOPPYDRIVEIMPL
+#endif // ____H_PARALLELPORTIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/include/SerialPortImpl.h

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -93 +93 @@
 };
 
-#endif // ____H_FLOPPYDRIVEIMPL
+#endif // ____H_SERIALPORTIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -758 +758 @@
     WriteLockHandle *stateLockHandle() { return &mStateLock; }
 
+    static HRESULT handleUnexpectedExceptions(VirtualBoxBase *const aThis, RT_SRC_POS_DECL);
+
     static HRESULT setErrorInternal(HRESULT aResultCode,
                                     const GUID &aIID,

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -279 +279 @@
     static HRESULT ensureFilePathExists(const Utf8Str &strFileName, bool fCreate);
 
-    static HRESULT handleUnexpectedExceptions(RT_SRC_POS_DECL);
-
     const Utf8Str& settingsFilePath();