Changeset 81047 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 27, 2019 11:04:07 AM (6 years ago)

Author:

vboxsync

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

133650

Message:

FE/Qt: bugref:9582: VM settings / Storage page: Rename AbstractControllerType to ControllerType.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsStorage.cpp (modified) (6 diffs)
• UIMachineSettingsStorage.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -381 +381 @@
 
 
-/* Abstract Controller Type */
-AbstractControllerType::AbstractControllerType (KStorageBus aBusType, KStorageControllerType aCtrType)
+/* Controller Type */
+ControllerType::ControllerType (KStorageBus aBusType, KStorageControllerType aCtrType)
     : mBusType (aBusType)
     , mCtrType (aCtrType)
@@ -394 +394 @@
 }
 
-KStorageBus AbstractControllerType::busType() const
+KStorageBus ControllerType::busType() const
 {
     return mBusType;
 }
 
-ControllerBusList AbstractControllerType::busTypes() const
+ControllerBusList ControllerType::busTypes() const
 {
     return m_buses;
 }
 
-KStorageControllerType AbstractControllerType::ctrType() const
+KStorageControllerType ControllerType::ctrType() const
 {
     return mCtrType;
 }
 
-ControllerTypeList AbstractControllerType::ctrTypes() const
+ControllerTypeList ControllerType::ctrTypes() const
 {
     return m_types;
 }
 
-PixmapType AbstractControllerType::pixmap(ItemState aState) const
+PixmapType ControllerType::pixmap(ItemState aState) const
 {
     return m_pixmaps.at(aState);
 }
 
-void AbstractControllerType::setCtrBusType(KStorageBus enmCtrBusType)
+void ControllerType::setCtrBusType(KStorageBus enmCtrBusType)
 {
     mBusType = enmCtrBusType;
@@ -428 +428 @@
 }
 
-void AbstractControllerType::setCtrType (KStorageControllerType aCtrType)
+void ControllerType::setCtrType (KStorageControllerType aCtrType)
 {
     mCtrType = aCtrType;
 }
 
-DeviceTypeList AbstractControllerType::deviceTypeList() const
+DeviceTypeList ControllerType::deviceTypeList() const
 {
     return uiCommon().virtualBox().GetSystemProperties().GetDeviceTypesForStorageBus (mBusType).toList();
 }
 
-void AbstractControllerType::updateBusInfo()
+void ControllerType::updateBusInfo()
 {
     m_buses.clear();
@@ -465 +465 @@
 }
 
-void AbstractControllerType::updateTypeInfo()
+void ControllerType::updateTypeInfo()
 {
     m_types.clear();
@@ -503 +503 @@
 }
 
-void AbstractControllerType::updatePixmaps()
+void ControllerType::updatePixmaps()
 {
     m_pixmaps.clear();
@@ -668 +668 @@
     {
         case KStorageBus_IDE:
-            mCtrType = new AbstractControllerType(KStorageBus_IDE, aControllerType);
+            mCtrType = new ControllerType(KStorageBus_IDE, aControllerType);
             break;
         case KStorageBus_SATA:
-            mCtrType = new AbstractControllerType(KStorageBus_SATA, aControllerType);
+            mCtrType = new ControllerType(KStorageBus_SATA, aControllerType);
             break;
         case KStorageBus_SCSI:
-            mCtrType = new AbstractControllerType(KStorageBus_SCSI, aControllerType);
+            mCtrType = new ControllerType(KStorageBus_SCSI, aControllerType);
             break;
         case KStorageBus_Floppy:
-            mCtrType = new AbstractControllerType(KStorageBus_Floppy, aControllerType);
+            mCtrType = new ControllerType(KStorageBus_Floppy, aControllerType);
             break;
         case KStorageBus_SAS:
-            mCtrType = new AbstractControllerType(KStorageBus_SAS, aControllerType);
+            mCtrType = new ControllerType(KStorageBus_SAS, aControllerType);
             break;
         case KStorageBus_USB:
-            mCtrType = new AbstractControllerType(KStorageBus_USB, aControllerType);
+            mCtrType = new ControllerType(KStorageBus_USB, aControllerType);
             break;
         case KStorageBus_PCIe:
-            mCtrType = new AbstractControllerType(KStorageBus_PCIe, aControllerType);
+            mCtrType = new ControllerType(KStorageBus_PCIe, aControllerType);
             break;
         case KStorageBus_VirtioSCSI:
-            mCtrType = new AbstractControllerType(KStorageBus_VirtioSCSI, aControllerType);
+            mCtrType = new ControllerType(KStorageBus_VirtioSCSI, aControllerType);
             break;
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -150 +150 @@
 };
 
-/* Abstract Controller Type */
-class SHARED_LIBRARY_STUFF AbstractControllerType
+/* Controller Type */
+class SHARED_LIBRARY_STUFF ControllerType
 {
 public:
 
-    AbstractControllerType (KStorageBus aBusType, KStorageControllerType aCtrType);
-    virtual ~AbstractControllerType() {}
+    ControllerType (KStorageBus aBusType, KStorageControllerType aCtrType);
+    virtual ~ControllerType() {}
 
     KStorageBus busType() const;
@@ -305 +305 @@
     QString mOldCtrName;
     QString mCtrName;
-    AbstractControllerType *mCtrType;
+    ControllerType *mCtrType;
     uint mPortCount;
     bool mUseIoCache;