Changeset 100520 in vbox for trunk/src/VBox

Timestamp:

Jul 11, 2023 4:32:53 PM (21 months ago)

Author:

vboxsync

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

158321

Message:

FE/Qt: bugref:9080. Refactoring viso entry creation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -312 +312 @@
         pAddedItem->setData(strISOFilePath, UICustomFileSystemModelData_ISOFilePath);
         pAddedItem->setIsOpened(false);
-        // if (fileInfo.isSymLink())
-        // {
-        //     pAddedItem->setTargetPath(fileInfo.symLinkTarget());
-        //     pAddedItem->setIsSymLinkToADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
-        // }
-        //createVisoEntry(pAddedItem);
+
     }
     if (m_pTableProxyModel)
@@ -381 +376 @@
             pAddedItem->setIsSymLinkToADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
         }
-        createVisoEntry(pAddedItem);
+        createVisoEntry(pAddedItem->path(), pAddedItem->data(UICustomFileSystemModelData_LocalPath).toString(), false);
     }
     if (m_pTableProxyModel)
@@ -387 +382 @@
 }
 
-void UIVisoContentBrowser::createVisoEntry(UICustomFileSystemItem *pItem, bool bRemove /* = false */)
-{
-    if (!pItem)
-        return;
-    if (pItem->path().isEmpty())
-        return;
-
-
-    if (!bRemove && pItem->data(UICustomFileSystemModelData_LocalPath).toString().isEmpty())
-        return;
+void UIVisoContentBrowser::createVisoEntry(const QString &strPath, const QString &strLocalPath, bool bRemove /* = false */)
+{
+    if (strPath.isEmpty())
+        return;
+
     if (!bRemove)
-        m_entryMap.insert(pItem->path(),
-                          pItem->data(UICustomFileSystemModelData_LocalPath).toString());
+    {
+        if(strLocalPath.isEmpty())
+            return;
+        m_entryMap.insert(strPath, strLocalPath);
+    }
     else
-        m_entryMap.insert(pItem->path(),
-                          ":remove:");
+        m_entryMap.insert(strPath, ":remove:");
 }
 
@@ -525 +517 @@
         }
         if (!bFoundInMap)
-            createVisoEntry(pItem, true /* bool bRemove */);
+            createVisoEntry(pItem->path(), pItem->data(UICustomFileSystemModelData_LocalPath).toString(), true /* bool bRemove */);
     }
 
@@ -872 +864 @@
             if (!pItem)
             {
-                pItem = new UICustomFileSystemItem(pathList[i],
-                                                   pParent,
-                                                   enmObjectType);
+                pItem = new UICustomFileSystemItem(pathList[i], pParent, enmObjectType);
                 if (!pItem)
                     continue;
@@ -882 +872 @@
             }
             if (i == pathList.size() - 1)
-                createVisoEntry(pItem);
+                createVisoEntry(pItem->path(), pItem->data(UICustomFileSystemModelData_LocalPath).toString(), false);
             pParent = pItem;
         }

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.h

@@ -127 +127 @@
      *  if @p bRemove is true then the value is the string ":remove:" which effectively removes the file object
      *  from the iso image. */
-    void                    createVisoEntry(UICustomFileSystemItem *pItem, bool bRemove = false);
+    void                    createVisoEntry(const QString &strPath, const QString &strLocalPath, bool bRemove = false);
     QString                 currentPath() const;
     UICustomFileSystemItem* searchItemByPath(const QString &strPath);