Changeset 102485 in vbox

Timestamp:

Dec 5, 2023 5:37:02 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10561. Some refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/globals/UICustomFileSystemModel.cpp (deleted)
• src/globals/UIFileSystemModel.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.h ) (13 diffs)
• src/guestctrl/UIFileManagerGuestTable.cpp (modified) (7 diffs)
• src/guestctrl/UIFileManagerGuestTable.h (modified) (2 diffs)
• src/guestctrl/UIFileManagerHostTable.cpp (modified) (8 diffs)
• src/guestctrl/UIFileManagerHostTable.h (modified) (2 diffs)
• src/guestctrl/UIFileManagerTable.cpp (modified) (29 diffs)
• src/guestctrl/UIFileManagerTable.h (modified) (9 diffs)
• src/medium/viso/UIVisoContentBrowser.cpp (modified) (47 diffs)
• src/medium/viso/UIVisoContentBrowser.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -820 +820 @@
         src/globals/UIAnimationFramework.h \
         src/globals/UICommon.h \
-        src/globals/UICustomFileSystemModel.h \
+        src/globals/UIFileSystemModel.h \
         src/globals/UIDesktopWidgetWatchdog.h \
         src/globals/UIMainEventListener.h \
@@ -1389 +1389 @@
         src/globals/UICommon.cpp \
         src/globals/UICursor.cpp \
-        src/globals/UICustomFileSystemModel.cpp \
+        src/globals/UIFileSystemModel.cpp \
         src/globals/UIDefs.cpp \
         src/globals/UIDesktopWidgetWatchdog.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UICustomFileSystemModel class declaration.
+ * VBox Qt GUI - UIFileSystemModel class declaration.
  */
 
@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_globals_UICustomFileSystemModel_h
-#define FEQT_INCLUDED_SRC_globals_UICustomFileSystemModel_h
+#ifndef FEQT_INCLUDED_SRC_globals_UIFileSystemModel_h
+#define FEQT_INCLUDED_SRC_globals_UIFileSystemModel_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -42 +42 @@
 
 class QMimeData;
-class UICustomFileSystemModel;
-
-enum UICustomFileSystemModelData
-{
-    UICustomFileSystemModelData_Name = 0,
-    UICustomFileSystemModelData_Size,
-    UICustomFileSystemModelData_ChangeTime,
-    UICustomFileSystemModelData_Owner,
-    UICustomFileSystemModelData_Permissions,
-    UICustomFileSystemModelData_LocalPath,
-    UICustomFileSystemModelData_ISOFilePath, /* in case of import-iso this contains full path of the container iso file. */
-    UICustomFileSystemModelData_RemovedFromVISO,
-    UICustomFileSystemModelData_DescendantRemovedFromVISO,
-    UICustomFileSystemModelData_Max
-};
-
-/** A UICustomFileSystemItem instance is a tree node representing a file object (file, directory, etc). The tree contructed
-    by these instances is the data source for the UICustomFileSystemModel. */
-class SHARED_LIBRARY_STUFF UICustomFileSystemItem
+class UIFileSystemModel;
+
+enum UIFileSystemModelData
+{
+    UIFileSystemModelData_Name = 0,
+    UIFileSystemModelData_Size,
+    UIFileSystemModelData_ChangeTime,
+    UIFileSystemModelData_Owner,
+    UIFileSystemModelData_Permissions,
+    UIFileSystemModelData_LocalPath,
+    UIFileSystemModelData_ISOFilePath, /* in case of import-iso this contains full path of the container iso file. */
+    UIFileSystemModelData_RemovedFromVISO,
+    UIFileSystemModelData_DescendantRemovedFromVISO,
+    UIFileSystemModelData_Max
+};
+
+/** A UIFileSystemItem instance is a tree node representing a file object (file, directory, etc). The tree contructed
+    by these instances is the data source for the UIFileSystemModel. */
+class SHARED_LIBRARY_STUFF UIFileSystemItem
 {
 
@@ -66 +66 @@
 
     /** @p strName contains file object name which is assumed to be unique among a parent object's children. */
-    UICustomFileSystemItem(const QString &strFileObjectName, UICustomFileSystemItem *parentItem, KFsObjType type);
-    virtual ~UICustomFileSystemItem();
+    UIFileSystemItem(const QString &strFileObjectName, UIFileSystemItem *parentItem, KFsObjType type);
+    virtual ~UIFileSystemItem();
 
     void reset();
-    virtual UICustomFileSystemItem *child(int row) const;
+    virtual UIFileSystemItem *child(int row) const;
     /** Searches for the child by file object name and returns it if found. */
-    UICustomFileSystemItem *child(const QString &strFileObjectName) const;
+    UIFileSystemItem *child(const QString &strFileObjectName) const;
     int childCount() const;
-    QList<UICustomFileSystemItem*> children() const;
+    QList<UIFileSystemItem*> children() const;
     /** Removes the item from the list of children and !!DELETES!! the item. */
-    void removeChild(UICustomFileSystemItem *pItem);
+    void removeChild(UIFileSystemItem *pItem);
     void removeChildren();
     int columnCount() const;
     QVariant data(int column) const;
     void setData(const QVariant &data, int index);
-    void setData(const QVariant &data, UICustomFileSystemModelData enmColumn);
+    void setData(const QVariant &data, UIFileSystemModelData enmColumn);
     int row() const;
-    UICustomFileSystemItem *parentItem();
-    UICustomFileSystemItem *parentItem() const;
+    UIFileSystemItem *parentItem();
+    UIFileSystemItem *parentItem() const;
 
     bool isDirectory() const;
@@ -128 +128 @@
 private:
 
-    void appendChild(UICustomFileSystemItem *child);
-    void setParentModel(UICustomFileSystemModel *pModel);
-    UICustomFileSystemModel *parentModel();
-
-    QList<UICustomFileSystemItem*>               m_childItems;
-    QMap<UICustomFileSystemModelData, QVariant>  m_itemData;
-    UICustomFileSystemItem *m_parentItem;
+    void appendChild(UIFileSystemItem *child);
+    void setParentModel(UIFileSystemModel *pModel);
+    UIFileSystemModel *parentModel();
+
+    QList<UIFileSystemItem*>               m_childItems;
+    QMap<UIFileSystemModelData, QVariant>  m_itemData;
+    UIFileSystemItem *m_parentItem;
     bool             m_bIsOpened;
     /** If this is a symlink m_targetPath keeps the absolute path of the target */
@@ -147 +147 @@
     QString          m_strToolTip;
     /** Pointer to the parent model. */
-    UICustomFileSystemModel *m_pParentModel;
-    friend UICustomFileSystemModel;
+    UIFileSystemModel *m_pParentModel;
+    friend UIFileSystemModel;
 };
 
 /** A QSortFilterProxyModel extension used in file tables. Modifies some
  *  of the base class behavior like lessThan(..) */
-class SHARED_LIBRARY_STUFF UICustomFileSystemProxyModel : public QSortFilterProxyModel
+class SHARED_LIBRARY_STUFF UIFileSystemProxyModel : public QSortFilterProxyModel
 {
 
@@ -160 +160 @@
 public:
 
-    UICustomFileSystemProxyModel(QObject *parent = 0);
+    UIFileSystemProxyModel(QObject *parent = 0);
 
     void setListDirectoriesOnTop(bool fListDirectoriesOnTop);
@@ -180 +180 @@
 };
 
-/** UICustomFileSystemModel serves as the model for a file structure.
+/** UIFileSystemModel serves as the model for a file structure.
  *  it supports a tree level hierarchy which can be displayed with
  *  QTableView and/or QTreeView.*/
-class SHARED_LIBRARY_STUFF UICustomFileSystemModel : public QAbstractItemModel
+class SHARED_LIBRARY_STUFF UIFileSystemModel : public QAbstractItemModel
 {
 
@@ -190 +190 @@
 signals:
 
-    void sigItemRenamed(UICustomFileSystemItem *pItem, const QString &strOldPath,
+    void sigItemRenamed(UIFileSystemItem *pItem, const QString &strOldPath,
                         const QString &strOldName, const QString &strNewName);
 
 public:
 
-    explicit UICustomFileSystemModel(QObject *parent = 0);
-    ~UICustomFileSystemModel();
+    explicit UIFileSystemModel(QObject *parent = 0);
+    ~UIFileSystemModel();
 
     QVariant       data(const QModelIndex &index, int role) const RT_OVERRIDE;
@@ -206 +206 @@
     QModelIndex    index(int row, int column,
                       const QModelIndex &parent = QModelIndex()) const RT_OVERRIDE;
-    QModelIndex    index(const UICustomFileSystemItem* item);
+    QModelIndex    index(const UIFileSystemItem* item);
     QModelIndex    parent(const QModelIndex &index) const RT_OVERRIDE;
     int            rowCount(const QModelIndex &parent = QModelIndex()) const RT_OVERRIDE;
@@ -218 +218 @@
     void           setShowHumanReadableSizes(bool fShowHumanReadableSizes);
     bool           showHumanReadableSizes() const;
-    void           deleteItem(UICustomFileSystemItem* pItem);
-    UICustomFileSystemItem* rootItem();
-    const UICustomFileSystemItem* rootItem() const;
+    void           deleteItem(UIFileSystemItem* pItem);
+    UIFileSystemItem* rootItem();
+    const UIFileSystemItem* rootItem() const;
 
     void setIsWindowsFileSystem(bool fIsWindowsFileSystem);
@@ -233 +233 @@
 private:
 
-    UICustomFileSystemItem    *m_pRootItem;
-    void setupModelData(const QStringList &lines, UICustomFileSystemItem *parent);
+    UIFileSystemItem    *m_pRootItem;
+    void setupModelData(const QStringList &lines, UIFileSystemItem *parent);
     bool m_fShowHumanReadableSizes;
     bool m_fIsWindowFileSystemModel;
@@ -240 +240 @@
 
 
-#endif /* !FEQT_INCLUDED_SRC_globals_UICustomFileSystemModel_h */
+#endif /* !FEQT_INCLUDED_SRC_globals_UIFileSystemModel_h */

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -38 +38 @@
 #include "UIConverter.h"
 #include "UICommon.h"
-#include "UICustomFileSystemModel.h"
+#include "UIFileSystemModel.h"
 #include "UIErrorString.h"
 #include "UIFileManager.h"
@@ -515 +515 @@
 
 bool UIFileManagerGuestTable::readDirectory(const QString& strPath,
-                                     UICustomFileSystemItem *parent, bool isStartDir /*= false*/)
+                                     UIFileSystemItem *parent, bool isStartDir /*= false*/)
 {
     if (!parent)
@@ -549 +549 @@
         }
 
-        QMap<QString, UICustomFileSystemItem*> fileObjects;
+        QMap<QString, UIFileSystemItem*> fileObjects;
 
         while (directory.isOk())
@@ -562 +562 @@
                     QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/RT_NS_1MS);
                     KFsObjType fsObjectType = fileType(fsInfo);
-                    UICustomFileSystemItem *item = new UICustomFileSystemItem(fsInfo.GetName(), parent, fsObjectType);
+                    UIFileSystemItem *item = new UIFileSystemItem(fsInfo.GetName(), parent, fsObjectType);
                     if (!item)
                         continue;
-                    item->setData(static_cast<qulonglong>(fsInfo.GetObjectSize()), UICustomFileSystemModelData_Size);
-                    item->setData(changeTime, UICustomFileSystemModelData_ChangeTime);
-                    item->setData(fsInfo.GetUserName(), UICustomFileSystemModelData_Owner);
-                    item->setData(permissionString(fsInfo), UICustomFileSystemModelData_Permissions);
-                    printf(" %s === %s\n", qPrintable(fsInfo.GetName()), qPrintable(fsInfo.GetFileAttributes()));
+                    item->setData(static_cast<qulonglong>(fsInfo.GetObjectSize()), UIFileSystemModelData_Size);
+                    item->setData(changeTime, UIFileSystemModelData_ChangeTime);
+                    item->setData(fsInfo.GetUserName(), UIFileSystemModelData_Owner);
+                    item->setData(permissionString(fsInfo), UIFileSystemModelData_Permissions);
                     item->setIsOpened(false);
                     item->setIsHidden(isFileObjectHidden(fsInfo));
@@ -606 +605 @@
 }
 
-void UIFileManagerGuestTable::deleteByItem(UICustomFileSystemItem *item)
+void UIFileManagerGuestTable::deleteByItem(UIFileSystemItem *item)
 {
     if (!item)
@@ -633 +632 @@
     if (!rootItem() || rootItem()->childCount() <= 0)
         return;
-    UICustomFileSystemItem *startDirItem = rootItem()->child(0);
+    UIFileSystemItem *startDirItem = rootItem()->child(0);
     if (!startDirItem)
         return;
@@ -651 +650 @@
 }
 
-bool UIFileManagerGuestTable::renameItem(UICustomFileSystemItem *item, const QString &strOldPath)
+bool UIFileManagerGuestTable::renameItem(UIFileSystemItem *item, const QString &strOldPath)
 {
     if (!item || item->isUpDirectory())

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h

@@ -53 +53 @@
 class CGuestSessionStateChangedEvent;
 class UIActionPool;
-class UICustomFileSystemItem;
+class UIFileSystemItem;
 class UIGuestSessionWidget;
 
@@ -81 +81 @@
 
     void            retranslateUi() override final;
-    virtual bool    readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) override final;
-    virtual void    deleteByItem(UICustomFileSystemItem *item) override final;
+    virtual bool    readDirectory(const QString& strPath, UIFileSystemItem *parent, bool isStartDir = false) override final;
+    virtual void    deleteByItem(UIFileSystemItem *item) override final;
     virtual void    goToHomeDirectory() override final;
-    virtual bool    renameItem(UICustomFileSystemItem *item, const QString &strOldPath) override final;
+    virtual bool    renameItem(UIFileSystemItem *item, const QString &strOldPath) override final;
     virtual bool    createDirectory(const QString &path, const QString &directoryName) override final;
     virtual QString fsObjectPropertyString() override final;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp

@@ -37 +37 @@
 #include "UIFileManager.h"
 #include "UIFileTableNavigationWidget.h"
-#include "UICustomFileSystemModel.h"
+#include "UIFileSystemModel.h"
 #include "UIFileManagerHostTable.h"
 #include "UIPathOperations.h"
@@ -112 +112 @@
         const QFileInfo &entryInfo = entryList.at(i);
         if (entryInfo.baseName().isEmpty() || entryInfo.baseName() == "." ||
-            entryInfo.baseName() == UICustomFileSystemModel::strUpDirectoryString)
+            entryInfo.baseName() == UIFileSystemModel::strUpDirectoryString)
             continue;
         statistics.m_totalSize += entryInfo.size();
@@ -157 +157 @@
 }
 
-/* static */ bool UIFileManagerHostTable::scanDirectory(const QString& strPath, UICustomFileSystemItem *parent,
-                                                        QMap<QString, UICustomFileSystemItem*> &fileObjects)
+/* static */ bool UIFileManagerHostTable::scanDirectory(const QString& strPath, UIFileSystemItem *parent,
+                                                        QMap<QString, UIFileSystemItem*> &fileObjects)
 {
 
@@ -173 +173 @@
     {
         const QFileInfo &fileInfo = entries.at(i);
-        UICustomFileSystemItem *item = new UICustomFileSystemItem(fileInfo.fileName(), parent, fileType(fileInfo));
+        UIFileSystemItem *item = new UIFileSystemItem(fileInfo.fileName(), parent, fileType(fileInfo));
         if (!item)
             continue;
 
-        item->setData(fileInfo.size(),         UICustomFileSystemModelData_Size);
-        item->setData(fileInfo.lastModified(), UICustomFileSystemModelData_ChangeTime);
-        item->setData(fileInfo.owner(),        UICustomFileSystemModelData_Owner);
-        item->setData(permissionString(fileInfo.permissions()),  UICustomFileSystemModelData_Permissions);
+        item->setData(fileInfo.size(),         UIFileSystemModelData_Size);
+        item->setData(fileInfo.lastModified(), UIFileSystemModelData_ChangeTime);
+        item->setData(fileInfo.owner(),        UIFileSystemModelData_Owner);
+        item->setData(permissionString(fileInfo.permissions()),  UIFileSystemModelData_Permissions);
 
         /* if the item is a symlink set the target path and
@@ -282 +282 @@
 }
 
-bool UIFileManagerHostTable::readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir /*= false*/)
+bool UIFileManagerHostTable::readDirectory(const QString& strPath, UIFileSystemItem *parent, bool isStartDir /*= false*/)
 {
     if (!parent)
         return false;
 
-    QMap<QString, UICustomFileSystemItem*> fileObjects;
+    QMap<QString, UIFileSystemItem*> fileObjects;
     if (!scanDirectory(strPath, parent, fileObjects))
         return false;
@@ -294 +294 @@
 }
 
-void UIFileManagerHostTable::deleteByItem(UICustomFileSystemItem *item)
+void UIFileManagerHostTable::deleteByItem(UIFileSystemItem *item)
 {
     if (item->isUpDirectory())
@@ -320 +320 @@
     if (!rootItem() || rootItem()->childCount() <= 0)
         return;
-    UICustomFileSystemItem *startDirItem = rootItem()->child(0);
+    UIFileSystemItem *startDirItem = rootItem()->child(0);
     if (!startDirItem)
         return;
@@ -328 +328 @@
 }
 
-bool UIFileManagerHostTable::renameItem(UICustomFileSystemItem *item, const QString &strOldPath)
+bool UIFileManagerHostTable::renameItem(UIFileSystemItem *item, const QString &strOldPath)
 {
     if (!item || item->isUpDirectory())

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.h

@@ -40 +40 @@
 /* Forward declarations: */
 class UIActionPool;
-class UICustomFileSystemItem;
+class UIFileSystemItem;
 
 /** This class scans the host file system by using the Qt API
-    and connects to the UICustomFileSystemModel*/
+    and connects to the UIFileSystemModel*/
 class UIFileManagerHostTable : public UIFileManagerTable
 {
@@ -61 +61 @@
     /** Scans the directory with the path @strPath and inserts items to the
      *  tree under the @p parent. */
-    static bool scanDirectory(const QString& strPath, UICustomFileSystemItem *parent,
-                              QMap<QString, UICustomFileSystemItem*> &fileObjects);
+    static bool scanDirectory(const QString& strPath, UIFileSystemItem *parent,
+                              QMap<QString, UIFileSystemItem*> &fileObjects);
     void            retranslateUi() override final;
-    virtual bool    readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) override final;
-    virtual void    deleteByItem(UICustomFileSystemItem *item) override final;
+    virtual bool    readDirectory(const QString& strPath, UIFileSystemItem *parent, bool isStartDir = false) override final;
+    virtual void    deleteByItem(UIFileSystemItem *item) override final;
     virtual void    goToHomeDirectory() override final;
-    virtual bool    renameItem(UICustomFileSystemItem *item, const QString &strOldPath) override final;
+    virtual bool    renameItem(UIFileSystemItem *item, const QString &strOldPath) override final;
     virtual bool    createDirectory(const QString &path, const QString &directoryName) override final;
     virtual QString fsObjectPropertyString() override final;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -43 +43 @@
 #include "UIActionPool.h"
 #include "UICommon.h"
-#include "UICustomFileSystemModel.h"
+#include "UIFileSystemModel.h"
 #include "UIErrorString.h"
 #include "UIFileManager.h"
@@ -458 +458 @@
     }
 
-    m_pModel = new UICustomFileSystemModel(this);
+    m_pModel = new UIFileSystemModel(this);
     if (!m_pModel)
         return;
 
-    connect(m_pModel, &UICustomFileSystemModel::sigItemRenamed,
+    connect(m_pModel, &UIFileSystemModel::sigItemRenamed,
             this, &UIFileManagerTable::sltHandleItemRenameAttempt);
 
-    m_pProxyModel = new UICustomFileSystemProxyModel(this);
+    m_pProxyModel = new UIFileSystemProxyModel(this);
     if (!m_pProxyModel)
         return;
@@ -497 +497 @@
         connect(m_pView, &UIGuestControlFileView::customContextMenuRequested,
                 this, &UIFileManagerTable::sltCreateFileViewContextMenu);
-        m_pView->hideColumn(UICustomFileSystemModelData_LocalPath);
-        m_pView->hideColumn(UICustomFileSystemModelData_ISOFilePath);
-        m_pView->hideColumn(UICustomFileSystemModelData_RemovedFromVISO);
-        m_pView->hideColumn(UICustomFileSystemModelData_DescendantRemovedFromVISO);
+        m_pView->hideColumn(UIFileSystemModelData_LocalPath);
+        m_pView->hideColumn(UIFileSystemModelData_ISOFilePath);
+        m_pView->hideColumn(UIFileSystemModelData_RemovedFromVISO);
+        m_pView->hideColumn(UIFileSystemModelData_DescendantRemovedFromVISO);
 
         m_sessionWidgets << m_pView;
@@ -536 +536 @@
         m_pView->selectionModel()->reset();
 
-    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
+    UIFileSystemItem *item = static_cast<UIFileSystemItem*>(index.internalPointer());
     if (item)
     {
@@ -556 +556 @@
     /* On Unix-like systems startItem represents the root directory. On Windows it is like "my computer" under which
      * drives are listed: */
-    UICustomFileSystemItem* startItem = new UICustomFileSystemItem(startPath, rootItem(), KFsObjType_Directory);
+    UIFileSystemItem* startItem = new UIFileSystemItem(startPath, rootItem(), KFsObjType_Directory);
 
     startItem->setIsOpened(false);
@@ -566 +566 @@
 }
 
-void UIFileManagerTable::populateStartDirectory(UICustomFileSystemItem *startItem)
+void UIFileManagerTable::populateStartDirectory(UIFileSystemItem *startItem)
 {
     determineDriveLetters();
@@ -578 +578 @@
         for (int i = 0; i < m_driveLetterList.size(); ++i)
         {
-            UICustomFileSystemItem* driveItem = new UICustomFileSystemItem(UIPathOperations::removeTrailingDelimiters(m_driveLetterList[i]),
+            UIFileSystemItem* driveItem = new UIFileSystemItem(UIPathOperations::removeTrailingDelimiters(m_driveLetterList[i]),
                                                                            startItem, KFsObjType_Directory);
             driveItem->setIsOpened(false);
@@ -587 +587 @@
 }
 
-void UIFileManagerTable::checkDotDot(QMap<QString,UICustomFileSystemItem*> &map,
-                                     UICustomFileSystemItem *parent, bool isStartDir)
+void UIFileManagerTable::checkDotDot(QMap<QString,UIFileSystemItem*> &map,
+                                     UIFileSystemItem *parent, bool isStartDir)
 {
     if (!parent)
         return;
     /* Make sure we have an item representing up directory, and make sure it is not there for the start dir: */
-    if (!map.contains(UICustomFileSystemModel::strUpDirectoryString)  && !isStartDir)
-    {
-        UICustomFileSystemItem *item = new UICustomFileSystemItem(UICustomFileSystemModel::strUpDirectoryString,
+    if (!map.contains(UIFileSystemModel::strUpDirectoryString)  && !isStartDir)
+    {
+        UIFileSystemItem *item = new UIFileSystemItem(UIFileSystemModel::strUpDirectoryString,
                                                                   parent, KFsObjType_Directory);
         item->setIsOpened(false);
-        map.insert(UICustomFileSystemModel::strUpDirectoryString, item);
-    }
-    else if (map.contains(UICustomFileSystemModel::strUpDirectoryString)  && isStartDir)
-    {
-        map.remove(UICustomFileSystemModel::strUpDirectoryString);
+        map.insert(UIFileSystemModel::strUpDirectoryString, item);
+    }
+    else if (map.contains(UIFileSystemModel::strUpDirectoryString)  && isStartDir)
+    {
+        map.remove(UIFileSystemModel::strUpDirectoryString);
     }
 }
@@ -671 +671 @@
         return;
 
-    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
+    UIFileSystemItem *item = static_cast<UIFileSystemItem*>(index.internalPointer());
     if (!item)
         return;
@@ -698 +698 @@
 void UIFileManagerTable::goIntoDirectory(const QStringList &pathTrail)
 {
-    UICustomFileSystemItem *parent = getStartDirectoryItem();
+    UIFileSystemItem *parent = getStartDirectoryItem();
 
     for(int i = 0; i < pathTrail.size(); ++i)
@@ -709 +709 @@
                 return;
         /* search the current path item among the parent's children: */
-        UICustomFileSystemItem *item = parent->child(pathTrail.at(i));
+        UIFileSystemItem *item = parent->child(pathTrail.at(i));
 
         if (!item)
@@ -725 +725 @@
 }
 
-void UIFileManagerTable::goIntoDirectory(UICustomFileSystemItem *item)
+void UIFileManagerTable::goIntoDirectory(UIFileSystemItem *item)
 {
     if (!item || !m_pModel)
@@ -732 +732 @@
 }
 
-UICustomFileSystemItem* UIFileManagerTable::indexData(const QModelIndex &index) const
+UIFileSystemItem* UIFileManagerTable::indexData(const QModelIndex &index) const
 {
     if (!index.isValid())
         return 0;
-    return static_cast<UICustomFileSystemItem*>(index.internalPointer());
+    return static_cast<UIFileSystemItem*>(index.internalPointer());
 }
 
@@ -745 +745 @@
     QModelIndex currentIndex = currentRootIndex();
 
-    UICustomFileSystemItem *treeItem = indexData(currentIndex);
+    UIFileSystemItem *treeItem = indexData(currentIndex);
     if (!treeItem)
         return;
@@ -806 +806 @@
     QModelIndex modelIndex =
         m_pProxyModel ? m_pProxyModel->mapToSource(selectedItemIndices.at(0)) : selectedItemIndices.at(0);
-    UICustomFileSystemItem *item = indexData(modelIndex);
+    UIFileSystemItem *item = indexData(modelIndex);
     if (!item || item->isUpDirectory())
         return;
@@ -819 +819 @@
     if (!currentIndex.isValid())
         return;
-    UICustomFileSystemItem *parentFolderItem = static_cast<UICustomFileSystemItem*>(currentIndex.internalPointer());
+    UIFileSystemItem *parentFolderItem = static_cast<UIFileSystemItem*>(currentIndex.internalPointer());
     if (!parentFolderItem)
         return;
-    QString strBase(UICustomFileSystemModel::tr("NewDirectory"));
+    QString strBase(UIFileSystemModel::tr("NewDirectory"));
     QString newDirectoryName(strBase);
     QStringList nameList = currentDirectoryListing();
@@ -838 +838 @@
 
     /* Now we try to edit the newly created item thereby enabling the user to rename the new item: */
-    QList<UICustomFileSystemItem*> content = parentFolderItem->children();
-    UICustomFileSystemItem* newItem = 0;
+    QList<UIFileSystemItem*> content = parentFolderItem->children();
+    UIFileSystemItem* newItem = 0;
     /* Search the new item: */
-    foreach (UICustomFileSystemItem* childItem, content)
+    foreach (UIFileSystemItem* childItem, content)
     {
 
@@ -909 +909 @@
 }
 
-void UIFileManagerTable::sltHandleItemRenameAttempt(UICustomFileSystemItem *pItem, const QString &strOldPath,
+void UIFileManagerTable::sltHandleItemRenameAttempt(UIFileSystemItem *pItem, const QString &strOldPath,
                                                     const QString &strOldName, const QString &strNewName)
 {
@@ -919 +919 @@
     {
         /* Restore the previous name. relist the view: */
-        pItem->setData(strOldName, static_cast<int>(UICustomFileSystemModelData_Name));
+        pItem->setData(strOldName, static_cast<int>(UIFileSystemModelData_Name));
         relist();
         emit sigLogOutput(QString(pItem->path()).append(" could not be renamed"), QString(), FileManagerLogType_Error);
@@ -961 +961 @@
             continue;
 
-        UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
+        UIFileSystemItem *item = static_cast<UIFileSystemItem*>(index.internalPointer());
         if (item && item->isUpDirectory())
         {
@@ -1004 +1004 @@
 void UIFileManagerTable::deleteByIndex(const QModelIndex &itemIndex)
 {
-    UICustomFileSystemItem *treeItem = indexData(itemIndex);
+    UIFileSystemItem *treeItem = indexData(itemIndex);
     if (!treeItem)
         return;
@@ -1012 +1012 @@
 void UIFileManagerTable::retranslateUi()
 {
-    UICustomFileSystemItem *pRootItem = rootItem();
+    UIFileSystemItem *pRootItem = rootItem();
     if (pRootItem)
     {
-        pRootItem->setData(UIFileManager::tr("Name"), UICustomFileSystemModelData_Name);
-        pRootItem->setData(UIFileManager::tr("Size"), UICustomFileSystemModelData_Size);
-        pRootItem->setData(UIFileManager::tr("Change Time"), UICustomFileSystemModelData_ChangeTime);
-        pRootItem->setData(UIFileManager::tr("Owner"), UICustomFileSystemModelData_Owner);
-        pRootItem->setData(UIFileManager::tr("Permissions"), UICustomFileSystemModelData_Permissions);
+        pRootItem->setData(UIFileManager::tr("Name"), UIFileSystemModelData_Name);
+        pRootItem->setData(UIFileManager::tr("Size"), UIFileSystemModelData_Size);
+        pRootItem->setData(UIFileManager::tr("Change Time"), UIFileSystemModelData_ChangeTime);
+        pRootItem->setData(UIFileManager::tr("Owner"), UIFileSystemModelData_Owner);
+        pRootItem->setData(UIFileManager::tr("Permissions"), UIFileSystemModelData_Permissions);
     }
 }
@@ -1087 +1087 @@
 }
 
-UICustomFileSystemItem *UIFileManagerTable::getStartDirectoryItem()
-{
-    UICustomFileSystemItem* pRootItem = rootItem();
+UIFileSystemItem *UIFileManagerTable::getStartDirectoryItem()
+{
+    UIFileSystemItem* pRootItem = rootItem();
     if (!pRootItem)
         return 0;
@@ -1104 +1104 @@
     if (!currentRoot.isValid())
         return QString();
-    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(currentRoot.internalPointer());
+    UIFileSystemItem *item = static_cast<UIFileSystemItem*>(currentRoot.internalPointer());
     if (!item)
         return QString();
@@ -1125 +1125 @@
         QModelIndex index =
             m_pProxyModel ? m_pProxyModel->mapToSource(selectedItemIndices.at(i)) : selectedItemIndices.at(i);
-        UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
+        UIFileSystemItem *item = static_cast<UIFileSystemItem*>(index.internalPointer());
         if (!item)
             continue;
@@ -1151 +1151 @@
 }
 
-UICustomFileSystemItem* UIFileManagerTable::rootItem()
+UIFileSystemItem* UIFileManagerTable::rootItem()
 {
     if (!m_pModel)
@@ -1261 +1261 @@
 
     int rowCount = m_pProxyModel->rowCount(m_pView->rootIndex());
-    UICustomFileSystemItem *pFoundItem = 0;
+    UIFileSystemItem *pFoundItem = 0;
     QModelIndex index;
     for (int i = 0; i < rowCount && !pFoundItem; ++i)
@@ -1268 +1268 @@
         if (!index.isValid())
             continue;
-        pFoundItem = static_cast<UICustomFileSystemItem*>(m_pProxyModel->mapToSource(index).internalPointer());
+        pFoundItem = static_cast<UIFileSystemItem*>(m_pProxyModel->mapToSource(index).internalPointer());
         if (!pFoundItem)
             continue;
@@ -1345 +1345 @@
 QStringList UIFileManagerTable::currentDirectoryListing() const
 {
-    UICustomFileSystemItem *pItem = static_cast<UICustomFileSystemItem*>(currentRootIndex().internalPointer());
+    UIFileSystemItem *pItem = static_cast<UIFileSystemItem*>(currentRootIndex().internalPointer());
     if (!pItem)
         return QStringList();
     QStringList list;
-    foreach (const UICustomFileSystemItem *pChild, pItem->children())
+    foreach (const UIFileSystemItem *pChild, pItem->children())
     {
         if (pChild)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

@@ -59 +59 @@
 class QVBoxLayout;
 class UIActionPool;
-class UICustomFileSystemItem;
-class UICustomFileSystemModel;
-class UICustomFileSystemProxyModel;
+class UIFileSystemItem;
+class UIFileSystemModel;
+class UIFileSystemProxyModel;
 class UIFileTableNavigationWidget;
 class UIGuestControlFileView;
@@ -137 +137 @@
 /** This class serves a base class for file table. Currently a guest version
  *  and a host version are derived from this base. Each of these children
- *  populates the UICustomFileSystemModel by scanning the file system
+ *  populates the UIFileSystemModel by scanning the file system
  *  differently. The file structure kept in this class as a tree. */
 class UIFileManagerTable : public QIWithRetranslateUI<QWidget>
@@ -210 +210 @@
     void changeLocation(const QModelIndex &index);
     void initializeFileTree();
-    void checkDotDot(QMap<QString,UICustomFileSystemItem*> &map, UICustomFileSystemItem *parent, bool isStartDir);
-
-    virtual bool     readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) = 0;
-    virtual void     deleteByItem(UICustomFileSystemItem *item) = 0;
+    void checkDotDot(QMap<QString,UIFileSystemItem*> &map, UIFileSystemItem *parent, bool isStartDir);
+
+    virtual bool     readDirectory(const QString& strPath, UIFileSystemItem *parent, bool isStartDir = false) = 0;
+    virtual void     deleteByItem(UIFileSystemItem *item) = 0;
     virtual void     goToHomeDirectory() = 0;
-    virtual bool     renameItem(UICustomFileSystemItem *item, const QString &strOldPath) = 0;
+    virtual bool     renameItem(UIFileSystemItem *item, const QString &strOldPath) = 0;
     virtual bool     createDirectory(const QString &path, const QString &directoryName) = 0;
     virtual QString  fsObjectPropertyString() = 0;
@@ -243 +243 @@
     void             goIntoDirectory(const QStringList &pathTrail);
     /** Goes into directory pointed by the @p item */
-    void             goIntoDirectory(UICustomFileSystemItem *item);
-    UICustomFileSystemItem* indexData(const QModelIndex &index) const;
+    void             goIntoDirectory(UIFileSystemItem *item);
+    UIFileSystemItem* indexData(const QModelIndex &index) const;
     bool             eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
     CGuestFsObjInfo  guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const;
     void             setSelectionDependentActionsEnabled(bool fIsEnabled);
-    UICustomFileSystemItem*   rootItem();
+    UIFileSystemItem*   rootItem();
     void             setPathSeparator(const QChar &separator);
     QHBoxLayout*     toolBarLayout();
@@ -281 +281 @@
      *  if the file system rename fails we restore the old name of the item. See the comment of
      *  sltRename() for more details. Note that when this slot is called item->path() has also changed. Thus strOldPath. */
-    void sltHandleItemRenameAttempt(UICustomFileSystemItem *pItem, const QString &strOldPath,
+    void sltHandleItemRenameAttempt(UIFileSystemItem *pItem, const QString &strOldPath,
                                     const QString &strOldName, const QString &strNewName);
     void sltHandleNavigationWidgetPathChange(const QString& strPath);
@@ -292 +292 @@
     /** @p itemIndex is assumed to be 'model' index not 'proxy model' index */
     void             deleteByIndex(const QModelIndex &itemIndex);
-    /** Returns the UICustomFileSystemItem for path / which is a direct (and single) child of m_pRootItem */
-    UICustomFileSystemItem *getStartDirectoryItem();
+    /** Returns the UIFileSystemItem for path / which is a direct (and single) child of m_pRootItem */
+    UIFileSystemItem *getStartDirectoryItem();
     void            deSelectUpDirectoryItem();
     void            setSelectionForAll(QItemSelectionModel::SelectionFlags flags);
@@ -299 +299 @@
     /** The start directory requires a special attention since on file systems with drive letters
      *  drive letter are direct children of the start directory. On other systems start directory is '/' */
-    void            populateStartDirectory(UICustomFileSystemItem *startItem);
+    void            populateStartDirectory(UIFileSystemItem *startItem);
     /** Root index of the m_pModel */
     QModelIndex     currentRootIndex() const;
@@ -313 +313 @@
     void            markUnmarkSearchLineEdit(bool fMark);
     QStringList     currentDirectoryListing() const;
-    UICustomFileSystemModel       *m_pModel;
-    UIGuestControlFileView        *m_pView;
-    UICustomFileSystemProxyModel  *m_pProxyModel;
+    UIFileSystemModel       *m_pModel;
+    UIGuestControlFileView  *m_pView;
+    UIFileSystemProxyModel  *m_pProxyModel;
 
     QILineEdit      *m_pSearchLineEdit;
@@ -323 +323 @@
     QHBoxLayout     *m_pToolBarLayout;
     QVector<QWidget*> m_sessionWidgets;
-    friend class     UICustomFileSystemModel;
+    friend class     UIFileSystemModel;
 };
 

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

@@ -40 +40 @@
 #include "QIToolBar.h"
 #include "UIActionPool.h"
-#include "UICustomFileSystemModel.h"
+#include "UIFileSystemModel.h"
 #include "UIPathOperations.h"
 #include "UIVisoContentBrowser.h"
@@ -263 +263 @@
     if (rootItem() && rootItem()->childCount() > 0)
     {
-        UICustomFileSystemItem *pStartItem = startItem();
+        UIFileSystemItem *pStartItem = startItem();
         if (pStartItem)
         {
@@ -279 +279 @@
 
 void UIVisoContentBrowser::importISOContentToViso(const QString &strISOFilePath,
-                                                  UICustomFileSystemItem *pParentItem /* = 0 */,
+                                                  UIFileSystemItem *pParentItem /* = 0 */,
                                                   const QString &strDirPath /* = QString() */)
 {
@@ -294 +294 @@
     if (!strDirPath.isEmpty())
     {
-        UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(UICustomFileSystemModel::strUpDirectoryString,
+        UIFileSystemItem* pAddedItem = new UIFileSystemItem(UIFileSystemModel::strUpDirectoryString,
                                                                         pParentItem,
                                                                         KFsObjType_Directory);
-        pAddedItem->setData(strISOFilePath, UICustomFileSystemModelData_ISOFilePath);
+        pAddedItem->setData(strISOFilePath, UIFileSystemModelData_ISOFilePath);
     }
     QList<ISOFileObject> objectList = openAndReadISODir(strISOFilePath, strDirPath);
@@ -314 +314 @@
             continue;
 
-        UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(fileInfo.fileName(), pParentItem,
+        UIFileSystemItem* pAddedItem = new UIFileSystemItem(fileInfo.fileName(), pParentItem,
                                                                         objectList[i].enmObjectType);
 
         QString path = UIPathOperations::mergePaths(pParentItem->path(), fileInfo.fileName());
-        pAddedItem->setData(path, UICustomFileSystemModelData_LocalPath);
-        pAddedItem->setData(strISOFilePath, UICustomFileSystemModelData_ISOFilePath);
+        pAddedItem->setData(path, UIFileSystemModelData_LocalPath);
+        pAddedItem->setData(strISOFilePath, UIFileSystemModelData_ISOFilePath);
         pAddedItem->setIsOpened(false);
 
@@ -331 +331 @@
 void UIVisoContentBrowser::removeISOContentFromViso()
 {
-    UICustomFileSystemItem* pParentItem = startItem();
+    UIFileSystemItem* pParentItem = startItem();
     AssertReturnVoid(pParentItem);
     AssertReturnVoid(m_pModel);
 
-    QList<UICustomFileSystemItem*> itemsToDelete;
+    QList<UIFileSystemItem*> itemsToDelete;
     /* Delete all children of startItem that were imported from an ISO: */
     for (int i = 0; i < pParentItem->childCount(); ++i)
     {
-        UICustomFileSystemItem* pItem = pParentItem->child(i);
-        if (!pItem || pItem->data(UICustomFileSystemModelData_ISOFilePath).toString().isEmpty())
+        UIFileSystemItem* pItem = pParentItem->child(i);
+        if (!pItem || pItem->data(UIFileSystemModelData_ISOFilePath).toString().isEmpty())
             continue;
         itemsToDelete << pItem;
     }
 
-    foreach (UICustomFileSystemItem *pItem, itemsToDelete)
+    foreach (UIFileSystemItem *pItem, itemsToDelete)
             m_pModel->deleteItem(pItem);
     if (m_pTableProxyModel)
@@ -364 +364 @@
          return;
 
-    UICustomFileSystemItem *pParentItem = static_cast<UICustomFileSystemItem*>(parentIndex.internalPointer());
+    UIFileSystemItem *pParentItem = static_cast<UIFileSystemItem*>(parentIndex.internalPointer());
     if (!pParentItem)
         return;
@@ -376 +376 @@
             continue;
 
-        UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(fileInfo.fileName(), pParentItem,
+        UIFileSystemItem* pAddedItem = new UIFileSystemItem(fileInfo.fileName(), pParentItem,
                                                                         fileType(fileInfo));
-        pAddedItem->setData(strPath, UICustomFileSystemModelData_LocalPath);
+        pAddedItem->setData(strPath, UIFileSystemModelData_LocalPath);
 
         pAddedItem->setIsOpened(false);
@@ -386 +386 @@
             pAddedItem->setIsSymLinkToADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
         }
-        createVisoEntry(pAddedItem->path(), pAddedItem->data(UICustomFileSystemModelData_LocalPath).toString(), false);
+        createVisoEntry(pAddedItem->path(), pAddedItem->data(UIFileSystemModelData_LocalPath).toString(), false);
     }
     if (m_pTableProxyModel)
@@ -422 +422 @@
 void UIVisoContentBrowser::retranslateUi()
 {
-    UICustomFileSystemItem *pRootItem = rootItem();
+    UIFileSystemItem *pRootItem = rootItem();
     if (pRootItem)
     {
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Name"), UICustomFileSystemModelData_Name);
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Size"), UICustomFileSystemModelData_Size);
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Change Time"), UICustomFileSystemModelData_ChangeTime);
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Owner"), UICustomFileSystemModelData_Owner);
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Permissions"), UICustomFileSystemModelData_Permissions);
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Local Path"), UICustomFileSystemModelData_LocalPath);
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Has Removed Child"), UICustomFileSystemModelData_DescendantRemovedFromVISO);
+        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Name"), UIFileSystemModelData_Name);
+        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Size"), UIFileSystemModelData_Size);
+        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Change Time"), UIFileSystemModelData_ChangeTime);
+        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Owner"), UIFileSystemModelData_Owner);
+        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Permissions"), UIFileSystemModelData_Permissions);
+        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Local Path"), UIFileSystemModelData_LocalPath);
+        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Has Removed Child"), UIFileSystemModelData_DescendantRemovedFromVISO);
     }
     if (m_pSubMenu)
@@ -443 +443 @@
     if (!index.isValid() || !m_pTableProxyModel)
         return;
-    UICustomFileSystemItem *pClickedItem =
-        static_cast<UICustomFileSystemItem*>(m_pTableProxyModel->mapToSource(index).internalPointer());
+    UIFileSystemItem *pClickedItem =
+        static_cast<UIFileSystemItem*>(m_pTableProxyModel->mapToSource(index).internalPointer());
     if (!pClickedItem)
         return;
@@ -452 +452 @@
     if (pClickedItem->isRemovedFromViso())
         return;
-    QString strISOPath = pClickedItem->data(UICustomFileSystemModelData_ISOFilePath).toString();
+    QString strISOPath = pClickedItem->data(UIFileSystemModelData_ISOFilePath).toString();
     if (pClickedItem->isUpDirectory())
         goUp();
     else if (!strISOPath.isEmpty())
     {
-        importISOContentToViso(strISOPath, pClickedItem, pClickedItem->data(UICustomFileSystemModelData_LocalPath).toString());
+        importISOContentToViso(strISOPath, pClickedItem, pClickedItem->data(UIFileSystemModelData_LocalPath).toString());
         setTableRootIndex(index);
     }
@@ -482 +482 @@
          return;
 
-    UICustomFileSystemItem *pParentItem = static_cast<UICustomFileSystemItem*>(parentIndex.internalPointer());
+    UIFileSystemItem *pParentItem = static_cast<UIFileSystemItem*>(parentIndex.internalPointer());
     if (!pParentItem)
         return;
 
     /*  Check to see if we already have a directory named strNewDirectoryName: */
-    const QList<UICustomFileSystemItem*> children = pParentItem->children();
-    foreach (const UICustomFileSystemItem *item, children)
+    const QList<UIFileSystemItem*> children = pParentItem->children();
+    foreach (const UIFileSystemItem *item, children)
     {
         if (item->fileObjectName() == strNewDirectoryName)
@@ -494 +494 @@
     }
 
-    UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(strNewDirectoryName, pParentItem,
+    UIFileSystemItem* pAddedItem = new UIFileSystemItem(strNewDirectoryName, pParentItem,
                                                                     KFsObjType_Directory);
 
@@ -514 +514 @@
 }
 
-void UIVisoContentBrowser::removeItems(const QList<UICustomFileSystemItem*> itemList)
+void UIVisoContentBrowser::removeItems(const QList<UIFileSystemItem*> itemList)
 {
     AssertReturnVoid(m_pModel);
     AssertReturnVoid(m_pTableProxyModel);
-    foreach(UICustomFileSystemItem *pItem, itemList)
+    foreach(UIFileSystemItem *pItem, itemList)
     {
         if (!pItem || pItem->isUpDirectory())
@@ -530 +530 @@
         bool bFoundInMap = m_entryMap.remove(strVisoPath) > 0;
         if (!bFoundInMap)
-            createVisoEntry(pItem->path(), pItem->data(UICustomFileSystemModelData_LocalPath).toString(), true /* bool bRemove */);
+            createVisoEntry(pItem->path(), pItem->data(UIFileSystemModelData_LocalPath).toString(), true /* bool bRemove */);
 
         markRemovedUnremovedItemParents(pItem, true);
@@ -539 +539 @@
 }
 
-void UIVisoContentBrowser::restoreItems(const QList<UICustomFileSystemItem*> itemList)
-{
-    foreach(UICustomFileSystemItem *pItem, itemList)
+void UIVisoContentBrowser::restoreItems(const QList<UIFileSystemItem*> itemList)
+{
+    foreach(UIFileSystemItem *pItem, itemList)
     {
         if (!pItem || pItem->isUpDirectory())
@@ -553 +553 @@
         bool bFoundInMap = m_entryMap.remove(strVisoPath) > 0;
         if (!bFoundInMap)
-            createVisoEntry(pItem->path(), pItem->data(UICustomFileSystemModelData_LocalPath).toString(), false /* bool bRemove */);
+            createVisoEntry(pItem->path(), pItem->data(UIFileSystemModelData_LocalPath).toString(), false /* bool bRemove */);
 
         markRemovedUnremovedItemParents(pItem, false);
@@ -561 +561 @@
 }
 
-void UIVisoContentBrowser::markRemovedUnremovedItemParents(UICustomFileSystemItem *pItem, bool fRemoved)
+void UIVisoContentBrowser::markRemovedUnremovedItemParents(UIFileSystemItem *pItem, bool fRemoved)
 {
     pItem->setRemovedFromViso(fRemoved);
-    UICustomFileSystemItem *pRoot = rootItem();
-    UICustomFileSystemItem *pParent = pItem->parentItem();
+    UIFileSystemItem *pRoot = rootItem();
+    UIFileSystemItem *pParent = pItem->parentItem();
 
     while (pParent && pParent != pRoot)
     {
         pParent->setToolTip(QApplication::translate("UIVisoCreatorWidget", "Child/children removed"));
-        pParent->setData(true, UICustomFileSystemModelData_DescendantRemovedFromVISO);
+        pParent->setData(true, UIFileSystemModelData_DescendantRemovedFromVISO);
         pParent = pParent->parentItem();
     }
@@ -579 +579 @@
     UIVisoBrowserBase::prepareObjects();
 
-    m_pModel = new UICustomFileSystemModel(this);
-    m_pTableProxyModel = new UICustomFileSystemProxyModel(this);
+    m_pModel = new UIFileSystemModel(this);
+    m_pTableProxyModel = new UIFileSystemProxyModel(this);
     if (m_pTableProxyModel)
     {
@@ -616 +616 @@
     m_pTableView->setModel(m_pTableProxyModel);
     setTableRootIndex();
-    m_pTableView->hideColumn(UICustomFileSystemModelData_Owner);
-    m_pTableView->hideColumn(UICustomFileSystemModelData_Permissions);
-    m_pTableView->hideColumn(UICustomFileSystemModelData_Size);
-    m_pTableView->hideColumn(UICustomFileSystemModelData_ChangeTime);
-    m_pTableView->hideColumn(UICustomFileSystemModelData_ISOFilePath);
-    m_pTableView->hideColumn(UICustomFileSystemModelData_RemovedFromVISO);
+    m_pTableView->hideColumn(UIFileSystemModelData_Owner);
+    m_pTableView->hideColumn(UIFileSystemModelData_Permissions);
+    m_pTableView->hideColumn(UIFileSystemModelData_Size);
+    m_pTableView->hideColumn(UIFileSystemModelData_ChangeTime);
+    m_pTableView->hideColumn(UIFileSystemModelData_ISOFilePath);
+    m_pTableView->hideColumn(UIFileSystemModelData_RemovedFromVISO);
 
     m_pTableView->setSortingEnabled(true);
@@ -729 +729 @@
                 this, &UIVisoContentBrowser::sltTableSelectionChanged);
     if (m_pModel)
-        connect(m_pModel, &UICustomFileSystemModel::sigItemRenamed,
+        connect(m_pModel, &UIFileSystemModel::sigItemRenamed,
                 this, &UIVisoContentBrowser::sltItemRenameAttempt);
 
@@ -756 +756 @@
 }
 
-UICustomFileSystemItem* UIVisoContentBrowser::rootItem()
+UIFileSystemItem* UIVisoContentBrowser::rootItem()
 {
     if (!m_pModel)
@@ -763 +763 @@
 }
 
-UICustomFileSystemItem* UIVisoContentBrowser::startItem()
-{
-    UICustomFileSystemItem* pRoot = rootItem();
+UIFileSystemItem* UIVisoContentBrowser::startItem()
+{
+    UIFileSystemItem* pRoot = rootItem();
 
     if (!pRoot || pRoot->childCount() <= 0)
@@ -781 +781 @@
     const QString startPath = QString("/");
 
-    UICustomFileSystemItem *pStartItem = new UICustomFileSystemItem(startPath, rootItem(), KFsObjType_Directory);
+    UIFileSystemItem *pStartItem = new UIFileSystemItem(startPath, rootItem(), KFsObjType_Directory);
 
     pStartItem->setIsOpened(false);
@@ -806 +806 @@
     if (strPath == currentPath())
         return;
-    UICustomFileSystemItem *pItem = searchItemByPath(strPath);
+    UIFileSystemItem *pItem = searchItemByPath(strPath);
 
     if (pItem && pItem->isDirectory() && !pItem->isRemovedFromViso())
@@ -816 +816 @@
 }
 
-UICustomFileSystemItem* UIVisoContentBrowser::searchItemByPath(const QString &strPath)
-{
-    UICustomFileSystemItem *pItem = startItem();
+UIFileSystemItem* UIVisoContentBrowser::searchItemByPath(const QString &strPath)
+{
+    UIFileSystemItem *pItem = startItem();
     QStringList path = UIPathOperations::pathTrail(strPath);
 
@@ -909 +909 @@
             continue;
 
-        UICustomFileSystemItem *pParent = startItem();
+        UIFileSystemItem *pParent = startItem();
         /* Make sure all the parents from start item until the immediate parent are created: */
         for (int i = 0; i < pathList.size(); ++i)
@@ -916 +916 @@
             strPath.append(pathList[i]);
 
-            UICustomFileSystemItem *pItem = searchItemByPath(strPath);
+            UIFileSystemItem *pItem = searchItemByPath(strPath);
             KFsObjType enmObjectType;
             /* All objects, except possibly the last one, are directories:*/
@@ -925 +925 @@
             if (!pItem)
             {
-                pItem = new UICustomFileSystemItem(pathList[i], pParent, enmObjectType);
+                pItem = new UIFileSystemItem(pathList[i], pParent, enmObjectType);
                 if (!pItem)
                     continue;
 
                 if (i == pathList.size() - 1)
-                    pItem->setData(strLocalPath, UICustomFileSystemModelData_LocalPath);
+                    pItem->setData(strLocalPath, UIFileSystemModelData_LocalPath);
                 /* Pre-scan and populate the directory since we may need its content while processing removed items: */
                 if (enmObjectType == KFsObjType_Directory)
@@ -936 +936 @@
             }
             if (i == pathList.size() - 1)
-                createVisoEntry(pItem->path(), pItem->data(UICustomFileSystemModelData_LocalPath).toString(), false);
+                createVisoEntry(pItem->path(), pItem->data(UIFileSystemModelData_LocalPath).toString(), false);
             pParent = pItem;
         }
@@ -948 +948 @@
 void UIVisoContentBrowser::processRemovedEntries(const QStringList &removedEntries)
 {
-    QList<UICustomFileSystemItem*> itemList;
+    QList<UIFileSystemItem*> itemList;
     foreach (const QString &strPath, removedEntries)
     {
         QFileInfo fileInfo(strPath);
-        UICustomFileSystemItem *pItem = searchItemByPath(strPath);
+        UIFileSystemItem *pItem = searchItemByPath(strPath);
         if (pItem)
             itemList << pItem;
@@ -971 +971 @@
 }
 
-void UIVisoContentBrowser::scanHostDirectory(UICustomFileSystemItem *directoryItem, bool fRecursive)
+void UIVisoContentBrowser::scanHostDirectory(UIFileSystemItem *directoryItem, bool fRecursive)
 {
     if (!directoryItem)
@@ -978 +978 @@
        should be empty: */
     if ((directoryItem->type() != KFsObjType_Directory && !directoryItem->isSymLinkToADirectory()) ||
-        directoryItem->data(UICustomFileSystemModelData_LocalPath).toString().isEmpty())
-        return;
-    QDir directory(directoryItem->data(UICustomFileSystemModelData_LocalPath).toString());
+        directoryItem->data(UIFileSystemModelData_LocalPath).toString().isEmpty())
+        return;
+    QDir directory(directoryItem->data(UIFileSystemModelData_LocalPath).toString());
     if (directory.exists() && !directoryItem->isOpened())
     {
@@ -991 +991 @@
                 continue;
             KFsObjType enmType = fileType(fileInfo);
-            UICustomFileSystemItem *newItem = new UICustomFileSystemItem(fileInfo.fileName(),
+            UIFileSystemItem *newItem = new UIFileSystemItem(fileInfo.fileName(),
                                                                          directoryItem,
                                                                          enmType);
-            newItem->setData(fileInfo.filePath(), UICustomFileSystemModelData_LocalPath);
+            newItem->setData(fileInfo.filePath(), UIFileSystemModelData_LocalPath);
             if (fileInfo.isSymLink())
             {
@@ -1030 +1030 @@
     const QString strName(QDir::toNativeSeparators("/"));
 
-    rootItem()->child(0)->setData(strName, UICustomFileSystemModelData_Name);
+    rootItem()->child(0)->setData(strName, UIFileSystemModelData_Name);
     /* If the table root index is the start item then we have to update the location selector text here: */
     // if (m_pTableProxyModel->mapToSource(m_pTableView->rootIndex()).internalPointer() == rootItem()->child(0))
@@ -1037 +1037 @@
 }
 
-void UIVisoContentBrowser::renameFileObject(UICustomFileSystemItem *pItem)
+void UIVisoContentBrowser::renameFileObject(UIFileSystemItem *pItem)
 {
     m_pTableView->edit(m_pTableProxyModel->mapFromSource(m_pModel->index(pItem)));
@@ -1044 +1044 @@
 void UIVisoContentBrowser::sltItemRenameAction()
 {
-    QList<UICustomFileSystemItem*> selectedItems = tableSelectedItems();
+    QList<UIFileSystemItem*> selectedItems = tableSelectedItems();
     if (selectedItems.empty())
         return;
@@ -1050 +1050 @@
 }
 
-void UIVisoContentBrowser::sltItemRenameAttempt(UICustomFileSystemItem *pItem, const QString &strOldPath,
+void UIVisoContentBrowser::sltItemRenameAttempt(UIFileSystemItem *pItem, const QString &strOldPath,
                                                 const QString &strOldName, const QString &strNewName)
 {
     if (!pItem || !pItem->parentItem())
         return;
-    QList<UICustomFileSystemItem*> children = pItem->parentItem()->children();
+    QList<UIFileSystemItem*> children = pItem->parentItem()->children();
     bool bDuplicate = false;
-    foreach (const UICustomFileSystemItem *item, children)
+    foreach (const UIFileSystemItem *item, children)
     {
         if (item->fileObjectName() == strNewName && item != pItem)
@@ -1068 +1068 @@
     {
         /* Restore the previous name in case the @strNewName is a duplicate: */
-        pItem->setData(strOldName, static_cast<int>(UICustomFileSystemModelData_Name));
+        pItem->setData(strOldName, static_cast<int>(UIFileSystemModelData_Name));
     }
     else
@@ -1076 +1076 @@
            VISO file for the old path since in some cases, when remaned item is not top level, it still
            appears in ISO. So we remove it explicitly: */
-        m_entryMap.insert(strNewPath, pItem->data(UICustomFileSystemModelData_LocalPath).toString());
+        m_entryMap.insert(strNewPath, pItem->data(UIFileSystemModelData_LocalPath).toString());
         m_entryMap.remove(strOldPath);
-        if (!pItem->data(UICustomFileSystemModelData_LocalPath).toString().isEmpty())
+        if (!pItem->data(UIFileSystemModelData_LocalPath).toString().isEmpty())
             m_entryMap.insert(strOldPath, cRemoveText);
     }
@@ -1130 +1130 @@
 }
 
-QList<UICustomFileSystemItem*> UIVisoContentBrowser::tableSelectedItems()
-{
-    QList<UICustomFileSystemItem*> selectedItems;
+QList<UIFileSystemItem*> UIVisoContentBrowser::tableSelectedItems()
+{
+    QList<UIFileSystemItem*> selectedItems;
     if (!m_pTableProxyModel)
         return selectedItems;
@@ -1141 +1141 @@
     foreach (QModelIndex index, list)
     {
-        UICustomFileSystemItem *pItem =
-            static_cast<UICustomFileSystemItem*>(m_pTableProxyModel->mapToSource(index).internalPointer());
+        UIFileSystemItem *pItem =
+            static_cast<UIFileSystemItem*>(m_pTableProxyModel->mapToSource(index).internalPointer());
         if (pItem)
             selectedItems << pItem;
@@ -1154 +1154 @@
         return QString();
     QModelIndex index = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
-    UICustomFileSystemItem *pItem = static_cast<UICustomFileSystemItem*>((index).internalPointer());
+    UIFileSystemItem *pItem = static_cast<UIFileSystemItem*>((index).internalPointer());
     if (!pItem)
         return QString();
@@ -1165 +1165 @@
         return false;
     QModelIndex index = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
-    UICustomFileSystemItem *pItem = static_cast<UICustomFileSystemItem*>((index).internalPointer());
+    UIFileSystemItem *pItem = static_cast<UIFileSystemItem*>((index).internalPointer());
     if (!index.isValid() || !pItem)
         return false;
@@ -1191 +1191 @@
 }
 
-const UICustomFileSystemItem* UIVisoContentBrowser::currentDirectoryItem() const
+const UIFileSystemItem* UIVisoContentBrowser::currentDirectoryItem() const
 {
     if (!m_pTableView || !m_pTableView->rootIndex().isValid())
@@ -1197 +1197 @@
     QModelIndex currentRoot = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
 
-    return static_cast<UICustomFileSystemItem*>(currentRoot.internalPointer());
+    return static_cast<UIFileSystemItem*>(currentRoot.internalPointer());
 }
 
 QStringList UIVisoContentBrowser::currentDirectoryListing() const
 {
-    const UICustomFileSystemItem *pCurrentDirectoryItem = currentDirectoryItem();
+    const UIFileSystemItem *pCurrentDirectoryItem = currentDirectoryItem();
     if (!pCurrentDirectoryItem)
         return QStringList();
     QStringList nameList;
-    foreach (const UICustomFileSystemItem *pChild, pCurrentDirectoryItem->children())
+    foreach (const UIFileSystemItem *pChild, pCurrentDirectoryItem->children())
     {
         if (pChild)

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

@@ -43 +43 @@
 /* Forward declarations: */
 class QFileInfo;
-class UICustomFileSystemItem;
-class UICustomFileSystemModel;
-class UICustomFileSystemProxyModel;
+class UIFileSystemItem;
+class UIFileSystemModel;
+class UIFileSystemProxyModel;
 class UIVisoContentTableView;
 
@@ -64 +64 @@
     /* Imports pathList (relative to ISO file's root) to VISO content. */
     void importISOContentToViso(const QString &strISOFilePath,
-                                UICustomFileSystemItem *pParentItem = 0,
+                                UIFileSystemItem *pParentItem = 0,
                                 const QString &strDirPath = QString());
     void removeISOContentFromViso();
@@ -87 +87 @@
     /** Handles the signal we get from the model during setData call. Restores the old name of the file object
      *  to @p strOldName if need be (if rename fails for some reason). */
-    void sltItemRenameAttempt(UICustomFileSystemItem *pItem, const QString &strOldPath,
+    void sltItemRenameAttempt(UIFileSystemItem *pItem, const QString &strOldPath,
                               const QString &strOldName, const QString &strNewName);
     void sltRemoveItems();
@@ -115 +115 @@
     void                    prepareToolBar();
     void                    initializeModel();
-    UICustomFileSystemItem *rootItem();
+    UIFileSystemItem *rootItem();
     /* Child of root. */
-    UICustomFileSystemItem *startItem();
+    UIFileSystemItem *startItem();
 
     QModelIndex             convertIndexToTableIndex(const QModelIndex &index);
     /** Lists the content of the host file system directory by using Qt file system API. */
-    void                    scanHostDirectory(UICustomFileSystemItem *directory, bool fRecursive);
+    void                    scanHostDirectory(UIFileSystemItem *directory, bool fRecursive);
     KFsObjType              fileType(const QFileInfo &fsInfo);
     /** Renames the starts item's name as VISO name changes. */
     void                    updateStartItemName();
-    void                    renameFileObject(UICustomFileSystemItem *pItem);
-    void                    removeItems(const QList<UICustomFileSystemItem*> itemList);
-    void                    restoreItems(const QList<UICustomFileSystemItem*> itemList);
+    void                    renameFileObject(UIFileSystemItem *pItem);
+    void                    removeItems(const QList<UIFileSystemItem*> itemList);
+    void                    restoreItems(const QList<UIFileSystemItem*> itemList);
     /** Creates and entry for pItem consisting of a map item (key is viso path and value is host file system path)
      *  if @p bRemove is true then the value is the string ":remove:" which effectively removes the file object
@@ -133 +133 @@
     void                    createVisoEntry(const QString &strPath, const QString &strLocalPath, bool bRemove = false);
     QString                 currentPath() const;
-    UICustomFileSystemItem* searchItemByPath(const QString &strPath);
+    UIFileSystemItem* searchItemByPath(const QString &strPath);
     void                    goToStart();
     /** Returns a list of items which are currecntly selected
      *  in the table view. */
-    QList<UICustomFileSystemItem*> tableSelectedItems();
+    QList<UIFileSystemItem*> tableSelectedItems();
     /* Names of the file objects of the current directory. */
     QStringList                    currentDirectoryListing() const;
@@ -145 +145 @@
     /* Processes a list of VISO paths that are loaded from a file and indicate file object to be removed from VISO content. */
     void                           processRemovedEntries(const QStringList &removedEntries);
-    const UICustomFileSystemItem*  currentDirectoryItem() const;
-    void                           markRemovedUnremovedItemParents(UICustomFileSystemItem *pItem, bool fRemoved);
+    const UIFileSystemItem*  currentDirectoryItem() const;
+    void                           markRemovedUnremovedItemParents(UIFileSystemItem *pItem, bool fRemoved);
     void                           enableDisableSelectionDependentActions();
     UIVisoContentTableView        *m_pTableView;
-    UICustomFileSystemModel       *m_pModel;
-    UICustomFileSystemProxyModel  *m_pTableProxyModel;
+    UIFileSystemModel             *m_pModel;
+    UIFileSystemProxyModel        *m_pTableProxyModel;
 
     QString                       m_strImportedISOPath;