Changeset 13580 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h

Timestamp:

Oct 27, 2008 2:04:18 PM (17 years ago)

Author:

vboxsync

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

38479

Message:

Ported s2 branch (r37120:38456).

File:

• trunk/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #include <QObject>
 
+class VBoxMedium;
 class QAction;
 class QMenu;
@@ -204 +205 @@
     void cannotSaveGlobalConfig (const CVirtualBox &vbox);
     void cannotSetSystemProperties (const CSystemProperties &props);
-    void cannotAccessUSB (const COMBase &obj);
+    void cannotAccessUSB (const COMBaseWithEI &aObj);
 
     void cannotCreateMachine (const CVirtualBox &vbox,
@@ -232 +233 @@
 
     void cannotSetSnapshotFolder (const CMachine &aMachine, const QString &aPath);
-    void cannotDiscardSnapshot (const CConsole &console, const CSnapshot &snapshot);
-    void cannotDiscardSnapshot (const CProgress &progress, const CSnapshot &snapshot);
+    void cannotDiscardSnapshot (const CConsole &aConsole,
+                                const QString &aSnapshotName);
+    void cannotDiscardSnapshot (const CProgress &aProgress,
+                                const QString &aSnapshotName);
     void cannotDiscardCurrentState (const CConsole &console);
     void cannotDiscardCurrentState (const CProgress &progress);
@@ -249 +252 @@
     bool confirmDiscardSavedState (const CMachine &machine);
 
-    bool confirmReleaseImage (QWidget *parent, const QString &usage);
-
-    void sayCannotOverwriteHardDiskImage (QWidget *parent, const QString &src);
-    int confirmHardDiskImageDeletion (QWidget *parent, const QString &src);
-    void cannotDeleteHardDiskImage (QWidget *parent, const CVirtualDiskImage &vdi);
-
-    bool confirmHardDiskUnregister (QWidget *parent, const QString &src);
+    bool confirmReleaseMedium (QWidget *aParent, const VBoxMedium &aMedium,
+                               const QString &aUsage);
+
+    bool confirmRemoveMedium (QWidget *aParent, const VBoxMedium &aMedium);
+
+    void sayCannotOverwriteHardDiskStorage (QWidget *aParent,
+                                            const QString &aLocation);
+    int confirmDeleteHardDiskStorage (QWidget *aParent,
+                                      const QString &aLocation);
+    void cannotDeleteHardDiskStorage (QWidget *aParent, const CHardDisk2 &aHD,
+                                      const CProgress &aProgress);
 
     int confirmDetachSATASlots (QWidget *aParent);
     int confirmRunNewHDWzdOrVDM (QWidget* aParent);
 
-    void cannotCreateHardDiskImage (
-        QWidget *parent, const CVirtualBox &vbox, const QString &src,
-        const CVirtualDiskImage &vdi, const CProgress &progress);
-    void cannotAttachHardDisk (QWidget *parent, const CMachine &m, const QUuid &id,
-                               KStorageBus bus, LONG channel, LONG dev);
-    void cannotDetachHardDisk (QWidget *parent, const CMachine &m,
-                               KStorageBus bus, LONG channel, LONG dev);
-    void cannotRegisterMedia (QWidget *parent, const CVirtualBox &vbox,
-                              VBoxDefs::DiskType type, const QString &src);
-    void cannotUnregisterMedia (QWidget *parent, const CVirtualBox &vbox,
-                                VBoxDefs::DiskType type, const QString &src);
+    void cannotCreateHardDiskStorage (QWidget *aParent, const CVirtualBox &aVBox,
+                                      const QString &aLocaiton,
+                                      const CHardDisk2 &aHD,
+                                      const CProgress &aProgress);
+    void cannotAttachHardDisk (QWidget *aParent, const CMachine &aMachine,
+                               const QString &aLocation, KStorageBus aBus,
+                               LONG aChannel, LONG aDevice);
+    void cannotDetachHardDisk (QWidget *aParent, const CMachine &aMachine,
+                               const QString &aLocation, KStorageBus aBus,
+                               LONG aChannel, LONG aDevice);
+
+    void cannotMountMedium (QWidget *aParent, const CMachine &aMachine,
+                            const VBoxMedium &aMedium, const COMResult &aResult);
+    void cannotUnmountMedium (QWidget *aParent, const CMachine &aMachine,
+                            const VBoxMedium &aMedium, const COMResult &aResult);
+    void cannotOpenMedium (QWidget *aParent, const CVirtualBox &aVBox,
+                           VBoxDefs::MediaType aType, const QString &aLocation);
+    void cannotCloseMedium (QWidget *aParent, const VBoxMedium &aMedium,
+                            const COMResult &aResult);
 
     void cannotOpenSession (const CSession &session);
@@ -276 +291 @@
                             const CProgress &progress = CProgress());
 
-    void cannotGetMediaAccessibility (const CUnknown &unk);
-
-/// @todo (r=dmik) later
-//    void cannotMountMedia (const CUnknown &unk);
-//    void cannotUnmountMedia (const CUnknown &unk);
+    void cannotGetMediaAccessibility (const VBoxMedium &aMedium);
 
 #if defined Q_WS_WIN
@@ -361 +372 @@
                            const QString &errorMsg);
 
+    static QString toAccusative (VBoxDefs::MediaType aType);
+
     static QString formatRC (HRESULT aRC);
 
@@ -371 +384 @@
     }
 
-    static QString formatErrorInfo (const COMBase &aWrapper)
+    static QString formatErrorInfo (const COMBaseWithEI &aWrapper)
     {
         Assert (aWrapper.lastRC() != S_OK);