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

Timestamp:

Mar 11, 2009 9:56:29 AM (16 years ago)

Author:

vboxsync

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

44161

Message:

Main: Rework storage controller handling to allow an arbitrary number of different storage controllers and remove code duplication:

• XML format changed
• New StorageController class
• Removed SATAController (obsolete)
• Removed the IDE controller code from BIOSSettings, handled in StorageController now

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxGlobal.h (modified) (2 diffs)
• VBoxVMInformationDlg.h (modified) (1 diff)

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

@@ -409 +409 @@
     }
 
-    QString toString (KIDEControllerType t) const
-    {
-        AssertMsg (!mIDEControllerTypes.value (t).isNull(), ("No text for %d", t));
-        return mIDEControllerTypes.value (t);
-    }
-
-    KIDEControllerType toIDEControllerType (const QString &s) const
-    {
-        QULongStringHash::const_iterator it =
-            qFind (mIDEControllerTypes.begin(), mIDEControllerTypes.end(), s);
-        AssertMsg (it != mIDEControllerTypes.end(), ("No value for {%s}",
-                                                     s.toLatin1().constData()));
-        return KIDEControllerType (it.key());
+    QString toString (KStorageControllerType t) const
+    {
+        AssertMsg (!mStorageControllerTypes.value (t).isNull(), ("No text for %d", t));
+        return mStorageControllerTypes.value (t);
+    }
+
+    KStorageControllerType toIDEControllerType (const QString &s) const
+    {
+        QULongStringHash::const_iterator it =
+            qFind (mStorageControllerTypes.begin(), mStorageControllerTypes.end(), s);
+        AssertMsg (it != mStorageControllerTypes.end(), ("No value for {%s}",
+                                                         s.toLatin1().constData()));
+        return KStorageControllerType (it.key());
     }
 
@@ -877 +877 @@
     QULongStringHash mNetworkAttachmentTypes;
     QULongStringHash mClipboardTypes;
-    QULongStringHash mIDEControllerTypes;
+    QULongStringHash mStorageControllerTypes;
     QULongStringHash mUSBDeviceStates;
 

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

@@ -72 +72 @@
 
     QString formatValue (const QString &aValueName, const QString &aValue, int aMaxSize);
-    QString formatHardDisk (KStorageBus aBus, LONG aChannel, LONG aDevice, const QString &aBelongsTo);
+    QString formatHardDisk (const QString &ctlName, LONG aChannel, LONG aDevice, const QString &aBelongsTo);
     QString formatAdapter (ULONG aSlot, const QString &aBelongsTo);