Changeset 7442 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Mar 13, 2008 2:33:18 PM (17 years ago)

Author:

vboxsync

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

28880

Message:

Main: Applied SATA changes from #2406. Increased XML settings version format from 1.2 to 1.3.pre.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxGlobal.h (modified) (4 diffs)
• VBoxProblemReporter.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -215 +215 @@
     }
 
-    QString toString (KDiskControllerType t) const
-    {
-        AssertMsg (!diskControllerTypes [t].isNull(), ("No text for %d", t));
-        return diskControllerTypes [t];
-    }
+    QString toString (KStorageBus t) const
+    {
+        AssertMsg (!storageBuses [t].isNull(), ("No text for %d", t));
+        return storageBuses [t];
+    }
+
+    QString toString (KStorageBus t, LONG c) const;
+    QString toString (KStorageBus t, LONG c, LONG d) const;
 
     QString toString (KHardDiskType t) const
@@ -316 +319 @@
         return toString (aHD.GetType());
     }
-
-    QString toString (KDiskControllerType t, LONG d) const;
 
     QString toString (KDeviceType t) const
@@ -631 +632 @@
     QStringVector sessionStates;
     QStringVector deviceTypes;
-    QStringVector diskControllerTypes;
+    QStringVector storageBuses;
+    QStringVector storageBusDevices;
+    QStringVector storageBusChannels;
     QStringVector diskTypes;
     QStringVector diskStorageTypes;
@@ -637 +640 @@
     QStringVector portModeTypes;
     QStringVector usbFilterActionTypes;
-    QStringVector diskControllerDevices;
     QStringVector audioDriverTypes;
     QStringVector audioControllerTypes;

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

@@ -196 +196 @@
         const CVirtualDiskImage &vdi, const CProgress &progress);
     void cannotAttachHardDisk (QWidget *parent, const CMachine &m, const QUuid &id,
-                               KDiskControllerType ctl, LONG dev);
+                               KStorageBus bus, LONG channel, LONG dev);
     void cannotDetachHardDisk (QWidget *parent, const CMachine &m,
-                               KDiskControllerType ctl, LONG dev);
+                               KStorageBus bus, LONG channel, LONG dev);
     void cannotRegisterMedia (QWidget *parent, const CVirtualBox &vbox,
                               VBoxDefs::DiskType type, const QString &src);