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

Timestamp:

Jan 17, 2024 6:12:12 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: VM settings / Storage page: More cleanup, mostly sanity checks; Removing some excessive stuff which can be done easier.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp (modified) (13 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

@@ -717 +717 @@
     /** Sorts the contents of model by @a iColumn and @a enmOrder. */
     void sort(int iColumn = 0, Qt::SortOrder enmOrder = Qt::AscendingOrder);
-    /** Returns attachment index by specified @a controllerIndex and @a attachmentStorageSlot. */
-    QModelIndex attachmentBySlot(QModelIndex controllerIndex, StorageSlot attachmentStorageSlot);
 
     /** Returns chipset type. */
@@ -2641 +2639 @@
 }
 
-QModelIndex StorageModel::attachmentBySlot(QModelIndex controllerIndex, StorageSlot attachmentStorageSlot)
-{
-    /* Check what parent model index is valid, set and of 'controller' type: */
-    AssertMsg(controllerIndex.isValid(), ("Controller index should be valid!\n"));
-    AbstractItem *pParentItem = static_cast<AbstractItem*>(controllerIndex.internalPointer());
-    AssertMsg(pParentItem, ("Parent item should be set!\n"));
-    AssertMsg(pParentItem->rtti() == AbstractItem::Type_ControllerItem, ("Parent item should be of 'controller' type!\n"));
-    NOREF(pParentItem);
-
-    /* Search for suitable attachment one by one: */
-    for (int i = 0; i < rowCount(controllerIndex); ++i)
-    {
-        QModelIndex curAttachmentIndex = index(i, 0, controllerIndex);
-        StorageSlot curAttachmentStorageSlot = data(curAttachmentIndex, R_AttSlot).value<StorageSlot>();
-        if (curAttachmentStorageSlot ==  attachmentStorageSlot)
-            return curAttachmentIndex;
-    }
-    return QModelIndex();
-}
-
 KChipsetType StorageModel::chipsetType() const
 {
@@ -3466 +3444 @@
 void UIStorageSettingsEditor::sltRemoveController()
 {
+    /* Acquire current index: */
     AssertPtrReturnVoid(m_pTreeViewStorage);
     const QModelIndex index = m_pTreeViewStorage->currentIndex();
@@ -3480 +3459 @@
 void UIStorageSettingsEditor::sltAddAttachment()
 {
+    /* Acquire current index: */
     AssertPtrReturnVoid(m_pTreeViewStorage);
     const QModelIndex index = m_pTreeViewStorage->currentIndex();
@@ -3537 +3517 @@
 void UIStorageSettingsEditor::sltRemoveAttachment()
 {
+    /* Acquire model, current index and it's parent index: */
     AssertPtrReturnVoid(m_pTreeViewStorage);
     const QModelIndex index = m_pTreeViewStorage->currentIndex();
@@ -3735 +3716 @@
 void UIStorageSettingsEditor::sltSetInformation()
 {
+    /* Acquire current index: */
     AssertPtrReturnVoid(m_pTreeViewStorage);
     const QModelIndex index = m_pTreeViewStorage->currentIndex();
@@ -3773 +3755 @@
                 StorageSlot attachmentStorageSlot = gpConverter->fromString<StorageSlot>(m_pComboSlot->currentText());
                 m_pModelStorage->setData(index, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
-                QModelIndex theSameIndexAtNewPosition = m_pModelStorage->attachmentBySlot(controllerIndex, attachmentStorageSlot);
-                AssertMsg(theSameIndexAtNewPosition.isValid(), ("Current attachment disappears!\n"));
-                m_pTreeViewStorage->setCurrentIndex(theSameIndexAtNewPosition);
+                for (int iAttachmentIndex = 0; iAttachmentIndex < m_pModelStorage->rowCount(controllerIndex); ++iAttachmentIndex)
+                {
+                    QModelIndex enumeratedIndex = m_pModelStorage->index(iAttachmentIndex, 0, controllerIndex);
+                    StorageSlot enumeratedStorageSlot = m_pModelStorage->data(enumeratedIndex, StorageModel::R_AttSlot).value<StorageSlot>();
+                    if (enumeratedStorageSlot == attachmentStorageSlot)
+                    {
+                        m_pTreeViewStorage->setCurrentIndex(enumeratedIndex);
+                        break;
+                    }
+                }
             }
             /* Setting attachment medium: */
@@ -3939 +3928 @@
 void UIStorageSettingsEditor::sltUpdateActionStates()
 {
+    /* Acquire current index: */
     AssertPtrReturnVoid(m_pTreeViewStorage);
     const QModelIndex index = m_pTreeViewStorage->currentIndex();
@@ -3991 +3981 @@
 void UIStorageSettingsEditor::sltHandleRowInsertion(const QModelIndex &parentIndex, int iPosition)
 {
-    AssertPtrReturnVoid(m_pModelStorage);
+    /* Acquire current index: */
     AssertPtrReturnVoid(m_pTreeViewStorage);
     const QModelIndex index = m_pModelStorage->index(iPosition, 0, parentIndex);
@@ -4349 +4339 @@
 
     /* Check what item we are hovering currently: */
+    AssertPtrReturnVoid(m_pTreeViewStorage);
     QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->position().toPoint());
     /* And make sure this is controller item, we are supporting dropping for this kind only: */
+    AssertPtrReturnVoid(m_pModelStorage);
     if (   !m_pModelStorage->data(index, StorageModel::R_IsController).toBool()
         || m_pModelStorage->data(index, StorageModel::R_ItemId).toString() == strControllerId)
@@ -4376 +4368 @@
 
     /* Check what item we are hovering currently: */
+    AssertPtrReturnVoid(m_pTreeViewStorage);
     QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->position().toPoint());
     /* And make sure this is controller item, we are supporting dropping for this kind only: */
+    AssertPtrReturnVoid(m_pModelStorage);
     if (m_pModelStorage->data(index, StorageModel::R_IsController).toBool())
     {
@@ -5086 +5080 @@
 #ifdef RT_STRICT
     AssertPtrReturnVoid(m_pTreeViewStorage);
+    AssertPtrReturnVoid(m_pModelStorage);
     const QModelIndex index = m_pTreeViewStorage->currentIndex();
     switch (enmBus)
@@ -5128 +5123 @@
 void UIStorageSettingsEditor::addAttachmentWrapper(KDeviceType enmDeviceType)
 {
+    /* Acquire current index: */
     AssertPtrReturnVoid(m_pTreeViewStorage);
     const QModelIndex index = m_pTreeViewStorage->currentIndex();
+    AssertPtrReturnVoid(m_pModelStorage);
     Assert(m_pModelStorage->data(index, StorageModel::R_IsController).toBool());
     Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool());