Changeset 101691 in vbox

Timestamp:

Oct 31, 2023 4:03:38 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: A bit of cleanup for tree-view UISettingsSelector.

Location:

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

Files:

• UISettingsSelector.cpp (modified) (4 diffs)
• UISettingsSelector.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp

@@ -616 +616 @@
             if (UISelectorTreeViewItem *pItem = indexToItem(specifiedIndex))
                 return pItem->id();
-            return QUuid();
+            return 0;
         }
         case R_ItemPixmap:
@@ -990 +990 @@
 {
     int iID = -1;
-    const QModelIndex currentIndex = m_pTreeView->currentIndex();
-    if (currentIndex.isValid())
-        iID = m_pModel->data(currentIndex, UISelectorModel::R_ItemId).toString().toInt();
+    const QModelIndex index = m_pTreeView->currentIndex();
+    if (index.isValid())
+        iID = m_pModel->data(index, UISelectorModel::R_ItemId).toString().toInt();
     return iID;
 }
@@ -999 +999 @@
 {
     int iID = -1;
-    const QModelIndex specifiedIndex = m_pModel->findItem(strLink);
-    if (specifiedIndex.isValid())
-        iID = m_pModel->data(specifiedIndex, UISelectorModel::R_ItemId).toString().toInt();
+    const QModelIndex index = m_pModel->findItem(strLink);
+    if (index.isValid())
+        iID = m_pModel->data(index, UISelectorModel::R_ItemId).toString().toInt();
     return iID;
 }
@@ -1007 +1007 @@
 void UISettingsSelectorTreeView::selectById(int iID)
 {
-    const QModelIndex specifiedIndex = m_pModel->findItem(iID);
-    if (specifiedIndex.isValid())
-        m_pTreeView->setCurrentIndex(specifiedIndex);
-}
-
-void UISettingsSelectorTreeView::sltHandleCurrentChanged(const QModelIndex &currentIndex,
+    const QModelIndex index = m_pModel->findItem(iID);
+    if (index.isValid())
+        m_pTreeView->setCurrentIndex(index);
+}
+
+void UISettingsSelectorTreeView::sltHandleCurrentChanged(const QModelIndex &index,
                                                          const QModelIndex & /* previousIndex */)
 {
-    if (currentIndex.isValid())
-    {
-        const int iID = m_pModel->data(currentIndex, UISelectorModel::R_ItemId).toString().toInt();
+    if (index.isValid())
+    {
+        const int iID = m_pModel->data(index, UISelectorModel::R_ItemId).toString().toInt();
         Assert(iID >= 0);
         emit sigCategoryChanged(iID);

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.h

@@ -185 +185 @@
     /** Holds the tree-view instance. */
     UISelectorTreeView *m_pTreeView;
-    /** Holds the tree-view instance. */
+    /** Holds the model instance. */
     UISelectorModel    *m_pModel;
 };