Changeset 77916 in vbox for trunk

Timestamp:

Mar 27, 2019 12:43:21 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Initial cleanup for UIChooserModel class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserModel.cpp (modified) (14 diffs)
• UIChooserModel.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -109 +109 @@
 UIActionPool *UIChooserModel::actionPool() const
 {
-    return chooser()->actionPool();
+    return chooser() ? chooser()->actionPool() : 0;
 }
 
@@ -117 +117 @@
 }
 
-UIChooserView *UIChooserModel::view()
-{
-    if (!scene())
-        return 0;
-    UIChooserView *pChooserView = qobject_cast<UIChooserView*>(scene()->views()[0]);
-    return pChooserView;
+UIChooserView *UIChooserModel::view() const
+{
+    return scene() && !scene()->views().isEmpty() ? qobject_cast<UIChooserView*>(scene()->views().first()) : 0;
 }
 
 QPaintDevice *UIChooserModel::paintDevice() const
 {
-    if (scene() && !scene()->views().isEmpty())
-        return scene()->views().first();
-    return 0;
+    return scene() && !scene()->views().isEmpty() ? scene()->views().first() : 0;
 }
 
 QGraphicsItem *UIChooserModel::itemAt(const QPointF &position, const QTransform &deviceTransform /* = QTransform() */) const
 {
-    return scene()->itemAt(position, deviceTransform);
+    return scene() ? scene()->itemAt(position, deviceTransform) : 0;
 }
 
@@ -389 +384 @@
 void UIChooserModel::makeSureSomeItemIsSelected()
 {
-    /* Make sure selection item list is never empty
-     * if at least one item (for example 'focus') present: */
+    /* Make sure selection list is never empty if at
+     * least one item (for example 'focus') present: */
     if (!currentItem() && focusItem())
         setCurrentItem(focusItem());
@@ -447 +442 @@
 void UIChooserModel::performSearch(const QString &strSearchTerm, int iItemSearchFlags)
 {
-    if (!invisibleRoot())
-        return;
-
-    /* Currently we perform the search only for machines. when this to be changed make sure the disabled flags
-       of the other item types are also managed correctly: */
-
-    QList<UIChooserNode*> allNodes = resetSearch();
+    /* Invisible root always exists: */
+    AssertPtrReturnVoid(invisibleRoot());
+
+    /* Currently we perform the search only for machines, when this to be changed make
+     * sure the disabled flags of the other item types are also managed correctly. */
+
+    /* Reset the search first to erase the disabled flag: */
+    const QList<UIChooserNode*> nodes = resetSearch();
+
+    /* Stop here if no search conditions specified: */
     if (strSearchTerm.isEmpty())
         return;
 
+    /* Search for all the nodes matching required condition: */
     invisibleRoot()->searchForNodes(strSearchTerm, iItemSearchFlags, m_searchResults);
 
-    foreach (UIChooserNode* pNode, allNodes)
+    /* Assign/reset the disabled flag for required nodes: */
+    foreach (UIChooserNode* pNode, nodes)
     {
         if (!pNode)
@@ -466 +466 @@
     }
 
+    /* Make sure 1st item visible: */
     scrollToSearchResult(true);
 }
@@ -471 +472 @@
 QList<UIChooserNode*> UIChooserModel::resetSearch()
 {
-    QList<UIChooserNode*> allNodes;
-    /* Calling UIChooserNode::searchForNodes with an empty search string returns a list all nodes (of the whole treee) of the required type: */
-    invisibleRoot()->searchForNodes(QString(), UIChooserItemSearchFlag_Machine, allNodes);
-
-    /* Reset the disabled flag of the node items first. */
-    foreach (UIChooserNode* pNode, allNodes)
+    QList<UIChooserNode*> nodes;
+
+    /* Invisible root always exists: */
+    AssertPtrReturn(invisibleRoot(), nodes);
+
+    /* Calling UIChooserNode::searchForNodes with an empty search string
+     * returns a list all nodes (of the whole tree) of the required type: */
+    invisibleRoot()->searchForNodes(QString(), UIChooserItemSearchFlag_Machine, nodes);
+
+    /* Reset the disabled flag of the nodes first: */
+    foreach (UIChooserNode *pNode, nodes)
     {
         if (!pNode)
@@ -482 +488 @@
         pNode->setDisabled(false);
     }
-    /* Reset the search result relate data: */
+
+    /* Reset the search result related data: */
     m_searchResults.clear();
     m_iCurrentScrolledIndex = -1;
-    return allNodes;
+    return nodes;
 }
 
 void UIChooserModel::scrollToSearchResult(bool fIsNext)
 {
+    /* If nothing was found: */
     if (m_searchResults.isEmpty())
     {
+        /* Clear the search widget's match count(s): */
         m_iCurrentScrolledIndex = -1;
         if (view())
@@ -552 +561 @@
     /* Remember new drag-object: */
     m_pCurrentDragObject = pDragObject;
-    connect(m_pCurrentDragObject, SIGNAL(destroyed(QObject*)), this, SLOT(sltCurrentDragObjectDestroyed()));
+    connect(m_pCurrentDragObject, &QDrag::destroyed,
+            this, &UIChooserModel::sltCurrentDragObjectDestroyed);
 }
 
@@ -660 +670 @@
     if (!fRegistered)
     {
-        /* Rebuild tree for main root: */
-        buildTreeForMainRoot();
+        /* Update tree for main root: */
         updateNavigation();
         updateLayout();
@@ -734 +743 @@
     if (!actionPool()->action(UIActionIndexST_M_Group_S_Rename)->isEnabled())
         return;
-
     /* Only for single selected group: */
     if (!isSingleGroupSelected())
@@ -748 +756 @@
     if (!actionPool()->action(UIActionIndexST_M_Group_S_Sort)->isEnabled())
         return;
-
     /* Only for single selected group: */
     if (!isSingleGroupSelected())
         return;
 
-    /* Sort group-node: */
-    sortNodes(currentItem()->node());
-}
-
-void UIChooserModel::sltShowHideSearchWidget()
-{
-    if (view())
-        setSearchWidgetVisible(!view()->isSearchWidgetVisible());
+    /* Sort nodes: */
+    currentItem()->node()->sortNodes();
+
+    /* Rebuild tree for main root: */
+    buildTreeForMainRoot();
+    updateNavigation();
+    updateLayout();
 }
 
@@ -973 +979 @@
         return;
 
-    /* Sort parent group-node: */
-    sortNodes(currentItem()->parentItem()->node());
+    /* Sort nodes: */
+    currentItem()->parentItem()->node()->sortNodes();
+
+    /* Rebuild tree for main root: */
+    buildTreeForMainRoot();
+    updateNavigation();
+    updateLayout();
 }
 
@@ -1128 +1139 @@
 {
     root()->resetDragToken();
+}
+
+void UIChooserModel::sltShowHideSearchWidget()
+{
+    if (view())
+        setSearchWidgetVisible(!view()->isSearchWidgetVisible());
 }
 
@@ -1648 +1665 @@
     return false;
 }
-
-void UIChooserModel::sortNodes(UIChooserNode *pNode)
-{
-    /* Sort nodes: */
-    pNode->sortNodes();
-
-    /* Rebuild tree for main root: */
-    buildTreeForMainRoot();
-    updateNavigation();
-    updateLayout();
-}

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -104 +104 @@
         /** Returns the scene reference. */
         QGraphicsScene *scene() const;
+        /** Returns the reference of the first view of the scene(). */
+        UIChooserView *view() const;
         /** Returns the paint device reference. */
         QPaintDevice *paintDevice() const;
@@ -180 +182 @@
         /** Performs a search starting from the m_pInvisibleRootNode. */
         void performSearch(const QString &strSearchTerm, int iItemSearchFlags);
-        /** Clean the search result data members and disables item's visual effects. Also returns a list of
-          * all nodes which may be utilized by the calling code. */
+        /** Cleans the search result data members and disables item's visual effects.
+          * Also returns a list of all nodes which may be utilized by the calling code. */
         QList<UIChooserNode*> resetSearch();
         /** Scrolls to next/prev (wrt. @a fIsNext) search result. */
@@ -262 +264 @@
         /** Handles group sort request. */
         void sltSortGroup();
-        /** Handles machine search widget show/hide request. */
-        void sltShowHideSearchWidget();
         /** Handles group destroy request. */
         void sltUngroupSelectedGroup();
@@ -283 +283 @@
         void sltCurrentDragObjectDestroyed();
 
+        /** Handles machine search widget show/hide request. */
+        void sltShowHideSearchWidget();
         /** Handles request to erase lookup timer. */
         void sltEraseLookupTimer();
@@ -326 +328 @@
         /** Popups context-menu of certain @a enmType in specified @a point. */
         void popupContextMenu(UIGraphicsSelectorContextMenuType enmType, QPoint point);
-        /** Returns the reference of the first view of the scene(). */
-        UIChooserView *view();
     /** @} */
 
@@ -356 +356 @@
         /** Processes drag leave @a pEvent. */
         bool processDragLeaveEvent(QGraphicsSceneDragDropEvent *pEvent);
-
-        /** Performs sorting for @a pNode. */
-        void sortNodes(UIChooserNode *pNode);
     /** @} */