Changeset 100419 in vbox for trunk/src/VBox

Timestamp:

Jul 6, 2023 5:40:11 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. bugref:6699. Some cleaning.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICustomFileSystemModel.cpp (modified) (6 diffs)
• UICustomFileSystemModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp

@@ -74 +74 @@
         return;
     m_childItems.append(item);
-    m_childMap.insert(item->fileObjectName(), item);
-}
-
-void UICustomFileSystemItem::childRenamed()
-{
-    /* Recreate child map to accomadate the new file object name of the children: */
-    m_childMap.clear();
-    foreach(UICustomFileSystemItem* pItem, m_childItems)
-        m_childMap[pItem->fileObjectName()] = pItem;
 }
 
@@ -89 +80 @@
     qDeleteAll(m_childItems);
     m_childItems.clear();
-    m_childMap.clear();
     m_bIsOpened = false;
 }
@@ -100 +90 @@
 UICustomFileSystemItem *UICustomFileSystemItem::child(const QString &fileObjectName) const
 {
-    if (!m_childMap.contains(fileObjectName))
-        return 0;
-    return m_childMap.value(fileObjectName);
+    foreach (UICustomFileSystemItem *pItem, m_childItems)
+        if (pItem && pItem->fileObjectName() == fileObjectName)
+            return pItem;
+    return 0;
 }
 
@@ -124 +115 @@
         return;
     m_childItems.removeAt(iIndex);
-    m_childMap.remove(pItem->fileObjectName());
     delete pItem;
     pItem = 0;
@@ -161 +151 @@
         return;
     m_itemData[static_cast<UICustomFileSystemModelData>(index)] = data;
-    if (static_cast<UICustomFileSystemModelData>(index) == UICustomFileSystemModelData_Name && parentItem())
-        parentItem()->childRenamed();
 }
 
@@ -206 +194 @@
     qDeleteAll(m_childItems);
     m_childItems.clear();
-    m_childMap.clear();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.h

@@ -119 +119 @@
 
     void appendChild(UICustomFileSystemItem *child);
-    void childRenamed();
     QList<UICustomFileSystemItem*>         m_childItems;
-    /** Used to find children by file object name */
-    QMap<QString, UICustomFileSystemItem*> m_childMap;
     QMap<UICustomFileSystemModelData, QVariant>  m_itemData;
     UICustomFileSystemItem *m_parentItem;