Changeset 76333 in vbox for trunk/src/VBox

Timestamp:

Dec 21, 2018 12:56:44 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699: More refactoring in file manager classes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (22 diffs)
• globals/UICustomFileSystemModel.h (modified) (8 diffs)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (6 diffs)
• guestctrl/UIFileManagerGuestTable.h (modified) (2 diffs)
• guestctrl/UIFileManagerHostTable.cpp (modified) (6 diffs)
• guestctrl/UIFileManagerHostTable.h (modified) (2 diffs)
• guestctrl/UIFileManagerTable.cpp (modified) (25 diffs)
• guestctrl/UIFileManagerTable.h (modified) (6 diffs)

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

@@ -36 +36 @@
 
 /*********************************************************************************************************************************
-*   UIFileTableItem implementation.                                                                                              *
+*   UICustomFileSystemItem implementation.                                                                                       *
 *********************************************************************************************************************************/
 
-UIFileTableItem::UIFileTableItem(const QVector<QVariant> &data,
-                                 UIFileTableItem *parent, KFsObjType type)
+UICustomFileSystemItem::UICustomFileSystemItem(const QVector<QVariant> &data,
+                                 UICustomFileSystemItem *parent, KFsObjType type)
     : m_itemData(data)
     , m_parentItem(parent)
@@ -50 +50 @@
 }
 
-UIFileTableItem::~UIFileTableItem()
+UICustomFileSystemItem::~UICustomFileSystemItem()
 {
     reset();
 }
 
-void UIFileTableItem::appendChild(UIFileTableItem *item)
+void UICustomFileSystemItem::appendChild(UICustomFileSystemItem *item)
 {
     if (!item)
@@ -63 +63 @@
 }
 
-void UIFileTableItem::reset()
+void UICustomFileSystemItem::reset()
 {
     qDeleteAll(m_childItems);
@@ -71 +71 @@
 }
 
-UIFileTableItem *UIFileTableItem::child(int row) const
+UICustomFileSystemItem *UICustomFileSystemItem::child(int row) const
 {
     return m_childItems.value(row);
 }
 
-UIFileTableItem *UIFileTableItem::child(const QString &path) const
+UICustomFileSystemItem *UICustomFileSystemItem::child(const QString &path) const
 {
     if (!m_childMap.contains(path))
@@ -83 +83 @@
 }
 
-int UIFileTableItem::childCount() const
+int UICustomFileSystemItem::childCount() const
 {
     return m_childItems.count();
 }
 
-int UIFileTableItem::columnCount() const
+int UICustomFileSystemItem::columnCount() const
 {
     return m_itemData.count();
 }
 
-QVariant UIFileTableItem::data(int column) const
+QVariant UICustomFileSystemItem::data(int column) const
 {
     return m_itemData.value(column);
 }
 
-QString UIFileTableItem::name() const
+QString UICustomFileSystemItem::name() const
 {
     if (m_itemData.isEmpty() || !m_itemData[0].canConvert(QMetaType::QString))
@@ -105 +105 @@
 }
 
-void UIFileTableItem::setData(const QVariant &data, int index)
+void UICustomFileSystemItem::setData(const QVariant &data, int index)
 {
     if (index >= m_itemData.length())
@@ -112 +112 @@
 }
 
-UIFileTableItem *UIFileTableItem::parentItem()
+UICustomFileSystemItem *UICustomFileSystemItem::parentItem()
 {
     return m_parentItem;
 }
 
-int UIFileTableItem::row() const
+int UICustomFileSystemItem::row() const
 {
     if (m_parentItem)
-        return m_parentItem->m_childItems.indexOf(const_cast<UIFileTableItem*>(this));
+        return m_parentItem->m_childItems.indexOf(const_cast<UICustomFileSystemItem*>(this));
     return 0;
 }
 
-bool UIFileTableItem::isDirectory() const
+bool UICustomFileSystemItem::isDirectory() const
 {
     return m_type == KFsObjType_Directory;
 }
 
-bool UIFileTableItem::isSymLink() const
+bool UICustomFileSystemItem::isSymLink() const
 {
     return m_type == KFsObjType_Symlink;
 }
 
-bool UIFileTableItem::isFile() const
+bool UICustomFileSystemItem::isFile() const
 {
     return m_type == KFsObjType_File;
 }
 
-void UIFileTableItem::clearChildren()
+void UICustomFileSystemItem::clearChildren()
 {
     qDeleteAll(m_childItems);
@@ -146 +146 @@
 }
 
-bool UIFileTableItem::isOpened() const
+bool UICustomFileSystemItem::isOpened() const
 {
     return m_bIsOpened;
 }
 
-void UIFileTableItem::setIsOpened(bool flag)
+void UICustomFileSystemItem::setIsOpened(bool flag)
 {
     m_bIsOpened = flag;
 }
 
-const QString  &UIFileTableItem::path() const
+const QString  &UICustomFileSystemItem::path() const
 {
     return m_strPath;
 }
 
-void UIFileTableItem::setPath(const QString &path)
+void UICustomFileSystemItem::setPath(const QString &path)
 {
     if (path.isNull() || path.isEmpty())
@@ -169 +169 @@
 }
 
-bool UIFileTableItem::isUpDirectory() const
+bool UICustomFileSystemItem::isUpDirectory() const
 {
     if (!isDirectory())
@@ -178 +178 @@
 }
 
-KFsObjType UIFileTableItem::type() const
+KFsObjType UICustomFileSystemItem::type() const
 {
     return m_type;
 }
 
-const QString &UIFileTableItem::targetPath() const
+const QString &UICustomFileSystemItem::targetPath() const
 {
     return m_strTargetPath;
 }
 
-void UIFileTableItem::setTargetPath(const QString &path)
+void UICustomFileSystemItem::setTargetPath(const QString &path)
 {
     m_strTargetPath = path;
 }
 
-bool UIFileTableItem::isSymLinkToADirectory() const
+bool UICustomFileSystemItem::isSymLinkToADirectory() const
 {
     return m_isTargetADirectory;
 }
 
-void UIFileTableItem::setIsSymLinkToADirectory(bool flag)
+void UICustomFileSystemItem::setIsSymLinkToADirectory(bool flag)
 {
     m_isTargetADirectory = flag;
 }
 
-bool UIFileTableItem::isSymLinkToAFile() const
+bool UICustomFileSystemItem::isSymLinkToAFile() const
 {
     return isSymLink() && !m_isTargetADirectory;
 }
 
-void UIFileTableItem::setIsDriveItem(bool flag)
+void UICustomFileSystemItem::setIsDriveItem(bool flag)
 {
     m_isDriveItem = flag;
 }
 
-bool UIFileTableItem::isDriveItem() const
+bool UICustomFileSystemItem::isDriveItem() const
 {
     return m_isDriveItem;
 }
 
-UICustomFileSystemProxyModel::UICustomFileSystemProxyModel(QObject *parent /* = 0 */)
-    :QSortFilterProxyModel(parent)
-    , m_fListDirectoriesOnTop(false)
-{
-}
-
-void UICustomFileSystemProxyModel::setListDirectoriesOnTop(bool fListDirectoriesOnTop)
-{
-    m_fListDirectoriesOnTop = fListDirectoriesOnTop;
+/* static */QVector<QVariant> UICustomFileSystemItem::createTreeItemData(const QString &strName, unsigned long long size,
+                                                                         const QDateTime &changeTime,
+                                                                         const QString &strOwner, const QString &strPermissions)
+{
+    QVector<QVariant> data;
+    data.resize(UICustomFileSystemModelColumn_Max);
+    data[UICustomFileSystemModelColumn_Name]        = strName;
+    data[UICustomFileSystemModelColumn_Size]        = (qulonglong)size;
+    data[UICustomFileSystemModelColumn_ChangeTime]  = changeTime;
+    data[UICustomFileSystemModelColumn_Owner]       = strOwner;
+    data[UICustomFileSystemModelColumn_Permissions] = strPermissions;
+    return data;
 }
 
@@ -241 +244 @@
 bool UICustomFileSystemProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
-    UIFileTableItem *pLeftItem = static_cast<UIFileTableItem*>(left.internalPointer());
-    UIFileTableItem *pRightItem = static_cast<UIFileTableItem*>(right.internalPointer());
+    UICustomFileSystemItem *pLeftItem = static_cast<UICustomFileSystemItem*>(left.internalPointer());
+    UICustomFileSystemItem *pRightItem = static_cast<UICustomFileSystemItem*>(right.internalPointer());
 
     if (pLeftItem && pRightItem)
@@ -281 +284 @@
 }
 
+UICustomFileSystemProxyModel::UICustomFileSystemProxyModel(QObject *parent /* = 0 */)
+    :QSortFilterProxyModel(parent)
+    , m_fListDirectoriesOnTop(false)
+{
+}
+
+void UICustomFileSystemProxyModel::setListDirectoriesOnTop(bool fListDirectoriesOnTop)
+{
+    m_fListDirectoriesOnTop = fListDirectoriesOnTop;
+}
+
+
+/*********************************************************************************************************************************
+*   UICustomFileSystemModel implementation.                                                                                      *
+*********************************************************************************************************************************/
+
 UICustomFileSystemModel::UICustomFileSystemModel(QObject *parent)
     : QAbstractItemModel(parent)
@@ -288 +307 @@
 }
 
-UIFileTableItem* UICustomFileSystemModel::rootItem()
+UICustomFileSystemItem* UICustomFileSystemModel::rootItem()
 {
     return m_pRootItem;
 }
 
-const UIFileTableItem* UICustomFileSystemModel::rootItem() const
+const UICustomFileSystemItem* UICustomFileSystemModel::rootItem() const
 {
     return m_pRootItem;
@@ -306 +325 @@
 {
     if (parent.isValid())
-        return static_cast<UIFileTableItem*>(parent.internalPointer())->columnCount();
+        return static_cast<UICustomFileSystemItem*>(parent.internalPointer())->columnCount();
     else
     {
@@ -322 +341 @@
         if (index.column() == 0 && value.canConvert(QMetaType::QString))
         {
-            UIFileTableItem *pItem = static_cast<UIFileTableItem*>(index.internalPointer());
+            UICustomFileSystemItem *pItem = static_cast<UICustomFileSystemItem*>(index.internalPointer());
             if (!pItem)
                 return false;
@@ -339 +358 @@
     if (!index.isValid())
         return QVariant();
-    UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
+    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
     if (!item)
         return QVariant();
@@ -398 +417 @@
     if (!index.isValid())
         return 0;
-    UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
+    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
     if (!item)
         return QAbstractItemModel::flags(index);
@@ -420 +439 @@
 }
 
-QModelIndex UICustomFileSystemModel::index(UIFileTableItem* item)
+QModelIndex UICustomFileSystemModel::index(UICustomFileSystemItem* item)
 {
     if (!item)
@@ -432 +451 @@
         return QModelIndex();
 
-    const UIFileTableItem* parentItem = rootItem();
+    const UICustomFileSystemItem* parentItem = rootItem();
 
     if (parent.isValid())
-        parentItem = static_cast<UIFileTableItem*>(parent.internalPointer());
+        parentItem = static_cast<UICustomFileSystemItem*>(parent.internalPointer());
 
     if (!parentItem)
         return QModelIndex();
 
-    UIFileTableItem *childItem = parentItem->child(row);
+    UICustomFileSystemItem *childItem = parentItem->child(row);
     if (childItem)
         return createIndex(row, column, childItem);
@@ -453 +472 @@
         return QModelIndex();
 
-    UIFileTableItem *childItem = static_cast<UIFileTableItem*>(index.internalPointer());
-    UIFileTableItem *parentItem = childItem->parentItem();
+    UICustomFileSystemItem *childItem = static_cast<UICustomFileSystemItem*>(index.internalPointer());
+    UICustomFileSystemItem *parentItem = childItem->parentItem();
 
     if (parentItem == rootItem())
@@ -466 +485 @@
     if (parent.column() > 0)
         return 0;
-    const UIFileTableItem *parentItem = rootItem();
+    const UICustomFileSystemItem *parentItem = rootItem();
     if (parent.isValid())
-        parentItem = static_cast<UIFileTableItem*>(parent.internalPointer());
+        parentItem = static_cast<UICustomFileSystemItem*>(parent.internalPointer());
     if (!parentItem)
         return 0;
@@ -518 +537 @@
     QVector<QVariant> headData;
     headData.resize(UICustomFileSystemModelColumn_Max);
-    m_pRootItem = new UIFileTableItem(headData, 0, KFsObjType_Directory);
-}
+    m_pRootItem = new UICustomFileSystemItem(headData, 0, KFsObjType_Directory);
+}

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

@@ -36 +36 @@
 };
 
-/** A UIFileTableItem instance is a tree node representing a file object (file, directory, etc). The tree contructed
+/** 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 UIFileTableItem
+class UICustomFileSystemItem
 {
 public:
@@ -45 +45 @@
      *  the name of the file object which is the file name including extension or name of the
      *  directory */
-    explicit UIFileTableItem(const QVector<QVariant> &data,
-                             UIFileTableItem *parentItem, KFsObjType type);
-    ~UIFileTableItem();
+    explicit UICustomFileSystemItem(const QVector<QVariant> &data,
+                             UICustomFileSystemItem *parentItem, KFsObjType type);
+    ~UICustomFileSystemItem();
 
-    void appendChild(UIFileTableItem *child);
+    void appendChild(UICustomFileSystemItem *child);
     void reset();
-    UIFileTableItem *child(int row) const;
+    UICustomFileSystemItem *child(int row) const;
     /** Searches for the child by path and returns it if found. */
-    UIFileTableItem *child(const QString &path) const;
+    UICustomFileSystemItem *child(const QString &path) const;
     int childCount() const;
     int columnCount() const;
@@ -59 +59 @@
     void setData(const QVariant &data, int index);
     int row() const;
-    UIFileTableItem *parentItem();
+    UICustomFileSystemItem *parentItem();
 
     bool isDirectory() const;
@@ -93 +93 @@
     bool isDriveItem() const;
 
+    static QVector<QVariant> createTreeItemData(const QString &strName, unsigned long long size, const QDateTime &changeTime,
+                                                const QString &strOwner, const QString &strPermissions);
+
 private:
 
-    QList<UIFileTableItem*>         m_childItems;
+    QList<UICustomFileSystemItem*>         m_childItems;
     /** Used to find children by name */
-    QMap<QString, UIFileTableItem*> m_childMap;
+    QMap<QString, UICustomFileSystemItem*> m_childMap;
     /** It is required that m_itemData[0] is name (QString) of the file object */
     QVector<QVariant>  m_itemData;
-    UIFileTableItem *m_parentItem;
+    UICustomFileSystemItem *m_parentItem;
     bool             m_bIsOpened;
     /** Full absolute path of the item. Without the trailing '/' */
@@ -145 +148 @@
 signals:
 
-    void sigItemRenamed(UIFileTableItem *pItem, QString strOldName, QString strNewName);
+    void sigItemRenamed(UICustomFileSystemItem *pItem, QString strOldName, QString strNewName);
 
 public:
@@ -160 +163 @@
     QModelIndex    index(int row, int column,
                       const QModelIndex &parent = QModelIndex()) const /* override */;
-    QModelIndex    index(UIFileTableItem* item);
+    QModelIndex    index(UICustomFileSystemItem* item);
     QModelIndex    parent(const QModelIndex &index) const /* override */;
     int            rowCount(const QModelIndex &parent = QModelIndex()) const /* override */;
@@ -172 +175 @@
     void           setShowHumanReadableSizes(bool fShowHumanReadableSizes);
     bool           showHumanReadableSizes() const;
-    UIFileTableItem* rootItem();
-    const UIFileTableItem* rootItem() const;
+    UICustomFileSystemItem* rootItem();
+    const UICustomFileSystemItem* rootItem() const;
 
     static const char* strUpDirectoryString;
@@ -179 +182 @@
 private:
     void                initializeTree();
-    UIFileTableItem    *m_pRootItem;
-    void setupModelData(const QStringList &lines, UIFileTableItem *parent);
+    UICustomFileSystemItem    *m_pRootItem;
+    void setupModelData(const QStringList &lines, UICustomFileSystemItem *parent);
     bool                m_fShowHumanReadableSizes;
 };

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

@@ -175 +175 @@
 
 void UIFileManagerGuestTable::readDirectory(const QString& strPath,
-                                     UIFileTableItem *parent, bool isStartDir /*= false*/)
+                                     UICustomFileSystemItem *parent, bool isStartDir /*= false*/)
 
 {
@@ -196 +196 @@
     {
         CFsObjInfo fsInfo = directory.Read();
-        QMap<QString, UIFileTableItem*> directories;
-        QMap<QString, UIFileTableItem*> files;
+        QMap<QString, UICustomFileSystemItem*> directories;
+        QMap<QString, UICustomFileSystemItem*> files;
 
         while (fsInfo.isOk())
@@ -208 +208 @@
 
             KFsObjType fsObjectType = fileType(fsInfo);
-            UIFileTableItem *item = new UIFileTableItem(data, parent, fsObjectType);
+            UICustomFileSystemItem *item = new UICustomFileSystemItem(data, parent, fsObjectType);
 
             if (!item)
@@ -243 +243 @@
 }
 
-void UIFileManagerGuestTable::deleteByItem(UIFileTableItem *item)
+void UIFileManagerGuestTable::deleteByItem(UICustomFileSystemItem *item)
 {
     if (!item)
@@ -289 +289 @@
     if (!rootItem() || rootItem()->childCount() <= 0)
         return;
-    UIFileTableItem *startDirItem = rootItem()->child(0);
+    UICustomFileSystemItem *startDirItem = rootItem()->child(0);
     if (!startDirItem)
         return;
@@ -303 +303 @@
 }
 
-bool UIFileManagerGuestTable::renameItem(UIFileTableItem *item, QString newBaseName)
+bool UIFileManagerGuestTable::renameItem(UICustomFileSystemItem *item, QString newBaseName)
 {
 

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

@@ -31 +31 @@
 /* Forward declarations: */
 class UIActionPool;
+class UICustomFileSystemItem;
 
 /** This class scans the guest file system by using the VBox Guest Control API
@@ -53 +54 @@
 
     void            retranslateUi() /* override */;
-    virtual void    readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */;
-    virtual void    deleteByItem(UIFileTableItem *item) /* override */;
+    virtual void    readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) /* override */;
+    virtual void    deleteByItem(UICustomFileSystemItem *item) /* override */;
     virtual void    deleteByPath(const QStringList &pathList) /* override */;
     virtual void    goToHomeDirectory() /* override */;
-    virtual bool    renameItem(UIFileTableItem *item, QString newBaseName);
+    virtual bool    renameItem(UICustomFileSystemItem *item, QString newBaseName);
     virtual bool    createDirectory(const QString &path, const QString &directoryName);
     virtual QString fsObjectPropertyString() /* override */;

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

@@ -202 +202 @@
 }
 
-void UIFileManagerHostTable::readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir /*= false*/)
+void UIFileManagerHostTable::readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir /*= false*/)
 {
     if (!parent)
@@ -213 +213 @@
         return;
     QFileInfoList entries = directory.entryInfoList();
-    QMap<QString, UIFileTableItem*> directories;
-    QMap<QString, UIFileTableItem*> files;
+    QMap<QString, UICustomFileSystemItem*> directories;
+    QMap<QString, UICustomFileSystemItem*> files;
 
     for (int i = 0; i < entries.size(); ++i)
@@ -220 +220 @@
 
         const QFileInfo &fileInfo = entries.at(i);
-        UIFileTableItem *item = new UIFileTableItem(createTreeItemData(fileInfo.fileName(), fileInfo.size(),
-                                                                       fileInfo.lastModified(), fileInfo.owner(),
-                                                                       permissionString(fileInfo.permissions())),
-                                                    parent, fileType(fileInfo));
+        QVector<QVariant> itemData = UICustomFileSystemItem::createTreeItemData(fileInfo.fileName(), fileInfo.size(),
+                                                                                fileInfo.lastModified(), fileInfo.owner(),
+                                                                                permissionString(fileInfo.permissions()));
+        UICustomFileSystemItem *item = new UICustomFileSystemItem(itemData, parent, fileType(fileInfo));
         if (!item)
             continue;
@@ -250 +250 @@
 }
 
-void UIFileManagerHostTable::deleteByItem(UIFileTableItem *item)
+void UIFileManagerHostTable::deleteByItem(UICustomFileSystemItem *item)
 {
     if (item->isUpDirectory())
@@ -297 +297 @@
     if (!rootItem() || rootItem()->childCount() <= 0)
         return;
-    UIFileTableItem *startDirItem = rootItem()->child(0);
+    UICustomFileSystemItem *startDirItem = rootItem()->child(0);
     if (!startDirItem)
         return;
@@ -305 +305 @@
 }
 
-bool UIFileManagerHostTable::renameItem(UIFileTableItem *item, QString newBaseName)
+bool UIFileManagerHostTable::renameItem(UICustomFileSystemItem *item, QString newBaseName)
 {
     if (!item || item->isUpDirectory() || newBaseName.isEmpty())

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

@@ -24 +24 @@
 /* Forward declarations: */
 class UIActionPool;
+class UICustomFileSystemItem;
 
 /** This class scans the host file system by using the Qt API
@@ -39 +40 @@
     KFsObjType  fileType(const QFileInfo &fsInfo);
     void            retranslateUi() /* override */;
-    virtual void    readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */;
-    virtual void    deleteByItem(UIFileTableItem *item) /* override */;
+    virtual void    readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) /* override */;
+    virtual void    deleteByItem(UICustomFileSystemItem *item) /* override */;
     virtual void    deleteByPath(const QStringList &pathList) /* override */;
     virtual void    goToHomeDirectory() /* override */;
-    virtual bool    renameItem(UIFileTableItem *item, QString newBaseName);
+    virtual bool    renameItem(UICustomFileSystemItem *item, QString newBaseName);
     virtual bool    createDirectory(const QString &path, const QString &directoryName);
     virtual QString fsObjectPropertyString() /* override */;

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

@@ -534 +534 @@
     m_pView->clearSelection();
 
-    UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
+    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
     if (item)
     {
@@ -551 +551 @@
 
     const QString startPath("/");
-    UIFileTableItem* startItem = new UIFileTableItem(createTreeItemData(startPath, 4096, QDateTime(),
-                                                                        "" /* owner */, "" /* permissions */),
-                                                     rootItem(), KFsObjType_Directory);
+    QVector<QVariant> itemData = UICustomFileSystemItem::createTreeItemData(startPath, 4096, QDateTime(),
+                                                                            "" /* owner */, "" /* permissions */);
+    UICustomFileSystemItem* startItem = new UICustomFileSystemItem(itemData, rootItem(), KFsObjType_Directory);
     startItem->setPath(startPath);
     rootItem()->appendChild(startItem);
@@ -564 +564 @@
 }
 
-void UIFileManagerTable::populateStartDirectory(UIFileTableItem *startItem)
+void UIFileManagerTable::populateStartDirectory(UICustomFileSystemItem *startItem)
 {
     determineDriveLetters();
@@ -576 +576 @@
         for (int i = 0; i < m_driveLetterList.size(); ++i)
         {
-            UIFileTableItem* driveItem = new UIFileTableItem(createTreeItemData(m_driveLetterList[i], 4096,
-                                                                                QDateTime(), QString(), QString()),
-                                                             startItem, KFsObjType_Directory);
+            QVector<QVariant> itemData = UICustomFileSystemItem::createTreeItemData(m_driveLetterList[i], 4096,
+                                                                                    QDateTime(), QString(), QString());
+            UICustomFileSystemItem* driveItem = new UICustomFileSystemItem(itemData, startItem, KFsObjType_Directory);
             driveItem->setPath(m_driveLetterList[i]);
             startItem->appendChild(driveItem);
@@ -588 +588 @@
 }
 
-void UIFileManagerTable::insertItemsToTree(QMap<QString,UIFileTableItem*> &map,
-                                                UIFileTableItem *parent, bool isDirectoryMap, bool isStartDir)
-{
-    if (parent)
-
+void UIFileManagerTable::insertItemsToTree(QMap<QString,UICustomFileSystemItem*> &map,
+                                                UICustomFileSystemItem *parent, bool isDirectoryMap, 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 (isDirectoryMap)
@@ -598 +598 @@
         if (!map.contains(UICustomFileSystemModel::strUpDirectoryString)  && !isStartDir)
         {
-            QVector<QVariant> data;
-            UIFileTableItem *item = new UIFileTableItem(createTreeItemData(UICustomFileSystemModel::strUpDirectoryString, 4096,
-                                                                           QDateTime(), QString(), QString())
-                                                        , parent, KFsObjType_Directory);
+            QVector<QVariant> data = UICustomFileSystemItem::createTreeItemData(UICustomFileSystemModel::strUpDirectoryString,
+                                                                                4096, QDateTime(), QString(), QString());
+
+            UICustomFileSystemItem *item = new UICustomFileSystemItem(data, parent, KFsObjType_Directory);
             item->setIsOpened(false);
             map.insert(UICustomFileSystemModel::strUpDirectoryString, item);
@@ -610 +610 @@
         }
     }
-    for (QMap<QString,UIFileTableItem*>::const_iterator iterator = map.begin();
+    for (QMap<QString,UICustomFileSystemItem*>::const_iterator iterator = map.begin();
         iterator != map.end(); ++iterator)
     {
@@ -672 +672 @@
         return;
 
-    UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
+    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
     if (!item)
         return;
@@ -695 +695 @@
 void UIFileManagerTable::goIntoDirectory(const QStringList &pathTrail)
 {
-    UIFileTableItem *parent = getStartDirectoryItem();
+    UICustomFileSystemItem *parent = getStartDirectoryItem();
 
     for(int i = 0; i < pathTrail.size(); ++i)
@@ -705 +705 @@
             readDirectory(parent->path(), parent, parent == getStartDirectoryItem());
         /* search the current path item among the parent's children: */
-        UIFileTableItem *item = parent->child(pathTrail.at(i));
+        UICustomFileSystemItem *item = parent->child(pathTrail.at(i));
         if (!item)
             return;
@@ -717 +717 @@
 }
 
-void UIFileManagerTable::goIntoDirectory(UIFileTableItem *item)
+void UIFileManagerTable::goIntoDirectory(UICustomFileSystemItem *item)
 {
     if (!item || !m_pModel)
@@ -724 +724 @@
 }
 
-UIFileTableItem* UIFileManagerTable::indexData(const QModelIndex &index) const
+UICustomFileSystemItem* UIFileManagerTable::indexData(const QModelIndex &index) const
 {
     if (!index.isValid())
         return 0;
-    return static_cast<UIFileTableItem*>(index.internalPointer());
+    return static_cast<UICustomFileSystemItem*>(index.internalPointer());
 }
 
@@ -737 +737 @@
     QModelIndex currentIndex = currentRootIndex();
 
-    UIFileTableItem *treeItem = indexData(currentIndex);
+    UICustomFileSystemItem *treeItem = indexData(currentIndex);
     if (!treeItem)
         return;
@@ -798 +798 @@
     QModelIndex modelIndex =
         m_pProxyModel ? m_pProxyModel->mapToSource(selectedItemIndices.at(0)) : selectedItemIndices.at(0);
-    UIFileTableItem *item = indexData(modelIndex);
+    UICustomFileSystemItem *item = indexData(modelIndex);
     if (!item || item->isUpDirectory())
         return;
@@ -811 +811 @@
     if (!currentIndex.isValid())
         return;
-    UIFileTableItem *item = static_cast<UIFileTableItem*>(currentIndex.internalPointer());
+    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(currentIndex.internalPointer());
     if (!item)
         return;
@@ -888 +888 @@
 }
 
-void UIFileManagerTable::sltHandleItemRenameAttempt(UIFileTableItem *pItem, QString strOldName, QString strNewName)
+void UIFileManagerTable::sltHandleItemRenameAttempt(UICustomFileSystemItem *pItem, QString strOldName, QString strNewName)
 {
     if (!pItem)
@@ -929 +929 @@
             continue;
 
-        UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
+        UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
         if (item && item->isUpDirectory())
         {
@@ -972 +972 @@
 void UIFileManagerTable::deleteByIndex(const QModelIndex &itemIndex)
 {
-    UIFileTableItem *treeItem = indexData(itemIndex);
+    UICustomFileSystemItem *treeItem = indexData(itemIndex);
     if (!treeItem)
         return;
@@ -980 +980 @@
 void UIFileManagerTable::retranslateUi()
 {
-    UIFileTableItem *pRootItem = rootItem();
+    UICustomFileSystemItem *pRootItem = rootItem();
     if (pRootItem)
     {
@@ -1052 +1052 @@
 }
 
-UIFileTableItem *UIFileManagerTable::getStartDirectoryItem()
-{
-    UIFileTableItem* pRootItem = rootItem();
+UICustomFileSystemItem *UIFileManagerTable::getStartDirectoryItem()
+{
+    UICustomFileSystemItem* pRootItem = rootItem();
     if (!pRootItem)
         return 0;
@@ -1083 +1083 @@
     if (!currentRoot.isValid())
         return QString();
-    UIFileTableItem *item = static_cast<UIFileTableItem*>(currentRoot.internalPointer());
+    UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(currentRoot.internalPointer());
     if (!item)
         return QString();
@@ -1104 +1104 @@
         QModelIndex index =
             m_pProxyModel ? m_pProxyModel->mapToSource(selectedItemIndices.at(i)) : selectedItemIndices.at(i);
-        UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
+        UICustomFileSystemItem *item = static_cast<UICustomFileSystemItem*>(index.internalPointer());
         if (!item)
             continue;
@@ -1130 +1130 @@
 }
 
-QVector<QVariant> UIFileManagerTable::createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
-                                                            const QString &strOwner, const QString &strPermissions)
-{
-    QVector<QVariant> data;
-    data.resize(UICustomFileSystemModelColumn_Max);
-    data[UICustomFileSystemModelColumn_Name]        = strName;
-    data[UICustomFileSystemModelColumn_Size]        = (qulonglong)size;
-    data[UICustomFileSystemModelColumn_ChangeTime]  = changeTime;
-    data[UICustomFileSystemModelColumn_Owner]       = strOwner;
-    data[UICustomFileSystemModelColumn_Permissions] = strPermissions;
-    return data;
-}
-
-UIFileTableItem* UIFileManagerTable::rootItem()
+UICustomFileSystemItem* UIFileManagerTable::rootItem()
 {
     if (!m_pModel)
@@ -1224 +1211 @@
 
     int rowCount = m_pProxyModel->rowCount(m_pView->rootIndex());
-    UIFileTableItem *pFoundItem = 0;
+    UICustomFileSystemItem *pFoundItem = 0;
     QModelIndex index;
     for (int i = 0; i < rowCount && !pFoundItem; ++i)
@@ -1231 +1218 @@
         if (!index.isValid())
             continue;
-        pFoundItem = static_cast<UIFileTableItem*>(m_pProxyModel->mapToSource(index).internalPointer());
+        pFoundItem = static_cast<UICustomFileSystemItem*>(m_pProxyModel->mapToSource(index).internalPointer());
         if (!pFoundItem)
             continue;

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

@@ -46 +46 @@
 class QVBoxLayout;
 class UIActionPool;
-class UIFileTableItem;
+class UICustomFileSystemItem;
 class UICustomFileSystemModel;
 class UICustomFileSystemProxyModel;
@@ -193 +193 @@
     void changeLocation(const QModelIndex &index);
     void initializeFileTree();
-    void insertItemsToTree(QMap<QString,UIFileTableItem*> &map, UIFileTableItem *parent,
+    void insertItemsToTree(QMap<QString,UICustomFileSystemItem*> &map, UICustomFileSystemItem *parent,
                            bool isDirectoryMap, bool isStartDir);
-    virtual void     readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) = 0;
-    virtual void     deleteByItem(UIFileTableItem *item) = 0;
+    virtual void     readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) = 0;
+    virtual void     deleteByItem(UICustomFileSystemItem *item) = 0;
     virtual void     deleteByPath(const QStringList &pathList) = 0;
     virtual void     goToHomeDirectory() = 0;
-    virtual bool     renameItem(UIFileTableItem *item, QString newBaseName) = 0;
+    virtual bool     renameItem(UICustomFileSystemItem *item, QString newBaseName) = 0;
     virtual bool     createDirectory(const QString &path, const QString &directoryName) = 0;
     virtual QString  fsObjectPropertyString() = 0;
@@ -225 +225 @@
     void             goIntoDirectory(const QStringList &pathTrail);
     /** Goes into directory pointed by the @p item */
-    void             goIntoDirectory(UIFileTableItem *item);
-    UIFileTableItem* indexData(const QModelIndex &index) const;
+    void             goIntoDirectory(UICustomFileSystemItem *item);
+    UICustomFileSystemItem* indexData(const QModelIndex &index) const;
     bool             eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
     CGuestFsObjInfo  guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const;
     void             setSelectionDependentActionsEnabled(bool fIsEnabled);
-    /** Creates a QList out of the parameters wrt. UICustomFileSystemModelColumn enum */
-    QVector<QVariant>  createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
-                                        const QString &strOwner, const QString &strPermissions);
-    UIFileTableItem*   rootItem();
-
+    UICustomFileSystemItem*   rootItem();
 
     QILabel                 *m_pLocationLabel;
@@ -260 +256 @@
      *  if the file system rename fails we restore the old name of the item. See the comment of
      *  sltRename() for more details. */
-    void sltHandleItemRenameAttempt(UIFileTableItem *pItem, QString strOldName, QString strNewName);
+    void sltHandleItemRenameAttempt(UICustomFileSystemItem *pItem, QString strOldName, QString strNewName);
 
 private:
@@ -268 +264 @@
     /** @p itemIndex is assumed to be 'model' index not 'proxy model' index */
     void             deleteByIndex(const QModelIndex &itemIndex);
-    /** Returns the UIFileTableItem for path / which is a direct (and single) child of m_pRootItem */
-    UIFileTableItem *getStartDirectoryItem();
+    /** Returns the UICustomFileSystemItem for path / which is a direct (and single) child of m_pRootItem */
+    UICustomFileSystemItem *getStartDirectoryItem();
     /** Shows a modal dialog with a line edit for user to enter a new directory name and return the entered string*/
     QString         getNewDirectoryName();
@@ -277 +273 @@
     /** 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(UIFileTableItem *startItem);
+    void            populateStartDirectory(UICustomFileSystemItem *startItem);
     /** Root index of the m_pModel */
     QModelIndex     currentRootIndex() const;