Changeset 76309 in vbox for trunk/src/VBox

Timestamp:

Dec 20, 2018 8:59:24 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Moving the ownership of the data to file model.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UICustomFileSystemModel.cpp (modified) (7 diffs)
• UICustomFileSystemModel.h (modified) (3 diffs)
• UIFileManagerGuestTable.cpp (modified) (1 diff)
• UIFileManagerHostTable.cpp (modified) (1 diff)
• UIFileManagerTable.cpp (modified) (8 diffs)
• UIFileManagerTable.h (modified) (1 diff)

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

@@ -53 +53 @@
 UIFileTableItem::~UIFileTableItem()
 {
-    qDeleteAll(m_childItems);
-    m_childItems.clear();
+    reset();
 }
 
@@ -63 +62 @@
     m_childItems.append(item);
     m_childMap.insert(item->name(), item);
+}
+
+void UIFileTableItem::reset()
+{
+    qDeleteAll(m_childItems);
+    m_childItems.clear();
+    m_childMap.clear();
+    m_bIsOpened = false;
 }
 
@@ -280 +287 @@
     , m_fShowHumanReadableSizes(false)
 {
-}
-
-UIFileTableItem* UICustomFileSystemModel::rootItem() const
-{
-    if (!m_pParent)
-        return 0;
-    return m_pParent->m_pRootItem;
+    initializeTree();
+}
+
+UIFileTableItem* UICustomFileSystemModel::rootItem()
+{
+    return m_pRootItem;
+}
+
+const UIFileTableItem* UICustomFileSystemModel::rootItem() const
+{
+    return m_pRootItem;
 }
 
 UICustomFileSystemModel::~UICustomFileSystemModel()
-{}
+{
+    delete m_pRootItem;
+}
 
 int UICustomFileSystemModel::columnCount(const QModelIndex &parent) const
@@ -422 +435 @@
 }
 
-QModelIndex UICustomFileSystemModel::index(int row, int column, const QModelIndex &parent)
-            const
+QModelIndex UICustomFileSystemModel::index(int row, int column, const QModelIndex &parent) const
 {
     if (!hasIndex(row, column, parent))
         return QModelIndex();
 
-    UIFileTableItem *parentItem;
-
-    if (!parent.isValid())
-        parentItem = rootItem();
-    else
+    const UIFileTableItem* parentItem = rootItem();
+
+    if (parent.isValid())
         parentItem = static_cast<UIFileTableItem*>(parent.internalPointer());
+
     if (!parentItem)
         return QModelIndex();
@@ -463 +474 @@
     if (parent.column() > 0)
         return 0;
-    UIFileTableItem *parentItem = 0;
-    if (!parent.isValid())
-        parentItem = rootItem();
-    else
+    const UIFileTableItem *parentItem = rootItem();
+    if (parent.isValid())
         parentItem = static_cast<UIFileTableItem*>(parent.internalPointer());
     if (!parentItem)
@@ -496 +505 @@
 }
 
+void UICustomFileSystemModel::reset()
+{
+    beginResetModel();
+    m_pRootItem->reset();
+    endResetModel();
+}
+
 void UICustomFileSystemModel::setShowHumanReadableSizes(bool fShowHumanReadableSizes)
 {
@@ -505 +521 @@
     return m_fShowHumanReadableSizes;
 }
+
+void UICustomFileSystemModel::initializeTree()
+{
+    QVector<QVariant> headData;
+    headData.resize(UICustomFileSystemModelColumn_Max);
+    m_pRootItem = new UIFileTableItem(headData, 0, KFsObjType_Directory);
+}

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

@@ -53 +53 @@
 
     void appendChild(UIFileTableItem *child);
-
+    void reset();
     UIFileTableItem *child(int row) const;
     /** Searches for the child by path and returns it if found. */
@@ -141 +141 @@
 /** UICustomFileSystemModel serves as the model for a file structure.
  *  it supports a tree level hierarchy which can be displayed with
- *  QTableView and/or QTreeView. Note the file structure data is not
- *  kept by the model but rather by the containing widget which also servers
- *  as the interface to functionality that this model provides.*/
+ *  QTableView and/or QTreeView. .*/
 class UICustomFileSystemModel : public QAbstractItemModel
 {
@@ -170 +168 @@
     void           beginReset();
     void           endReset();
+    void           reset();
+
     void           setShowHumanReadableSizes(bool fShowHumanReadableSizes);
     bool           showHumanReadableSizes() const;
+    UIFileTableItem* rootItem();
+    const UIFileTableItem* rootItem() const;
 
     static const char* strUpDirectoryString;
 
 private:
-
-    UIFileTableItem* rootItem() const;
+    void                initializeTree();
+    UIFileTableItem    *m_pRootItem;
     void setupModelData(const QStringList &lines, UIFileTableItem *parent);
     UIFileManagerTable *m_pParent;
-    UIFileTableItem    *m_pRootItem;
     bool                m_fShowHumanReadableSizes;
 

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

@@ -286 +286 @@
     if (m_comGuestSession.isNull())
         return;
-    if (!m_pRootItem || m_pRootItem->childCount() <= 0)
-        return;
-    UIFileTableItem *startDirItem = m_pRootItem->child(0);
+    if (!rootItem() || rootItem()->childCount() <= 0)
+        return;
+    UIFileTableItem *startDirItem = rootItem()->child(0);
     if (!startDirItem)
         return;

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

@@ -294 +294 @@
 void UIFileManagerHostTable::goToHomeDirectory()
 {
-    if (!m_pRootItem || m_pRootItem->childCount() <= 0)
-        return;
-    UIFileTableItem *startDirItem = m_pRootItem->child(0);
+    if (!rootItem() || rootItem()->childCount() <= 0)
+        return;
+    UIFileTableItem *startDirItem = rootItem()->child(0);
     if (!startDirItem)
         return;

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

@@ -511 +511 @@
     :QIWithRetranslateUI<QWidget>(pParent)
     , m_eFileOperationType(FileOperationType_None)
-    , m_pRootItem(0)
     , m_pLocationLabel(0)
     , m_pPropertiesDialog(0)
@@ -528 +527 @@
 UIFileManagerTable::~UIFileManagerTable()
 {
-    delete m_pRootItem;
 }
 
@@ -534 +532 @@
 {
     if (m_pModel)
-        m_pModel->beginReset();
-    delete m_pRootItem;
-    m_pRootItem = 0;
-    if (m_pModel)
-        m_pModel->endReset();
+        m_pModel->reset();
+
     if (m_pLocationComboBox)
     {
@@ -680 +675 @@
 void UIFileManagerTable::initializeFileTree()
 {
-    if (m_pRootItem)
-        reset();
-
-    /* Root item: */
+    if (m_pModel)
+        m_pModel->reset();
+    if (!rootItem())
+        return;
+
     const QString startPath("/");
-    QVector<QVariant> headData;
-    headData.resize(UICustomFileSystemModelColumn_Max);
-    m_pRootItem = new UIFileTableItem(headData, 0, KFsObjType_Directory);
     UIFileTableItem* startItem = new UIFileTableItem(createTreeItemData(startPath, 4096, QDateTime(),
                                                                         "" /* owner */, "" /* permissions */),
-                                                     m_pRootItem, KFsObjType_Directory);
+                                                     rootItem(), KFsObjType_Directory);
     startItem->setPath(startPath);
-    m_pRootItem->appendChild(startItem);
+    rootItem()->appendChild(startItem);
     startItem->setIsOpened(false);
     populateStartDirectory(startItem);
@@ -1102 +1095 @@
 void UIFileManagerTable::retranslateUi()
 {
-    if (m_pRootItem)
-    {
-        m_pRootItem->setData(UIFileManager::tr("Name"), UICustomFileSystemModelColumn_Name);
-        m_pRootItem->setData(UIFileManager::tr("Size"), UICustomFileSystemModelColumn_Size);
-        m_pRootItem->setData(UIFileManager::tr("Change Time"), UICustomFileSystemModelColumn_ChangeTime);
-        m_pRootItem->setData(UIFileManager::tr("Owner"), UICustomFileSystemModelColumn_Owner);
-        m_pRootItem->setData(UIFileManager::tr("Permissions"), UICustomFileSystemModelColumn_Permissions);
+    UIFileTableItem *pRootItem = rootItem();
+    if (pRootItem)
+    {
+        pRootItem->setData(UIFileManager::tr("Name"), UICustomFileSystemModelColumn_Name);
+        pRootItem->setData(UIFileManager::tr("Size"), UICustomFileSystemModelColumn_Size);
+        pRootItem->setData(UIFileManager::tr("Change Time"), UICustomFileSystemModelColumn_ChangeTime);
+        pRootItem->setData(UIFileManager::tr("Owner"), UICustomFileSystemModelColumn_Owner);
+        pRootItem->setData(UIFileManager::tr("Permissions"), UICustomFileSystemModelColumn_Permissions);
     }
     if (m_pWarningLabel)
@@ -1175 +1169 @@
 UIFileTableItem *UIFileManagerTable::getStartDirectoryItem()
 {
-    if (!m_pRootItem)
+    UIFileTableItem* pRootItem = rootItem();
+    if (!pRootItem)
         return 0;
-    if (m_pRootItem->childCount() <= 0)
+    if (pRootItem->childCount() <= 0)
         return 0;
-    return m_pRootItem->child(0);
+    return pRootItem->child(0);
 }
 
@@ -1250 +1245 @@
 }
 
-
 QVector<QVariant> UIFileManagerTable::createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
                                                             const QString &strOwner, const QString &strPermissions)
@@ -1262 +1256 @@
     data[UICustomFileSystemModelColumn_Permissions] = strPermissions;
     return data;
+}
+
+UIFileTableItem* UIFileManagerTable::rootItem()
+{
+    if (!m_pModel)
+        return 0;
+    return m_pModel->rootItem();
 }
 

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

@@ -256 +256 @@
     QVector<QVariant>  createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
                                         const QString &strOwner, const QString &strPermissions);
-
-    UIFileTableItem         *m_pRootItem;
+    UIFileTableItem*   rootItem();
+
+
     QILabel                 *m_pLocationLabel;
     UIPropertiesDialog      *m_pPropertiesDialog;