Changeset 90350 in vbox for trunk/src

Timestamp:

Jul 27, 2021 7:26:13 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: QITreeWidget: A bit of coding-style fixes for r128418.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QITreeWidget.cpp (modified) (2 diffs)
• QITreeWidget.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp

@@ -438 +438 @@
 }
 
-QList<QTreeWidgetItem*> QITreeWidget::filterItems(const QITreeWidgetItemFilter &filter, QTreeWidgetItem* pParent /* = 0 */)
+QList<QTreeWidgetItem*> QITreeWidget::filterItems(const QITreeWidgetItemFilter &filter, QTreeWidgetItem *pParent /* = 0 */)
 {
     QList<QTreeWidgetItem*> filteredItemList;
-    if (!pParent)
-        filterItemsInternal(filter, invisibleRootItem(), filteredItemList);
-    else
-        filterItemsInternal(filter, pParent, filteredItemList);
+    filterItemsInternal(filter, pParent ? pParent : invisibleRootItem(), filteredItemList);
     return filteredItemList;
 }
 
-void QITreeWidget::filterItemsInternal(const QITreeWidgetItemFilter &filter,
-                                           QTreeWidgetItem* pParent, QList<QTreeWidgetItem*> &filteredItemList)
+void QITreeWidget::paintEvent(QPaintEvent *pEvent)
+{
+    /* Create item painter: */
+    QPainter painter;
+    painter.begin(viewport());
+
+    /* Notify listeners about painting: */
+    QTreeWidgetItemIterator it(this);
+    while (*it)
+    {
+        emit painted(*it, &painter);
+        ++it;
+    }
+
+    /* Close item painter: */
+    painter.end();
+
+    /* Call to base-class: */
+    QTreeWidget::paintEvent(pEvent);
+}
+
+void QITreeWidget::resizeEvent(QResizeEvent *pEvent)
+{
+    /* Call to base-class: */
+    QTreeWidget::resizeEvent(pEvent);
+
+    /* Notify listeners about resizing: */
+    emit resized(pEvent->size(), pEvent->oldSize());
+}
+
+void QITreeWidget::filterItemsInternal(const QITreeWidgetItemFilter &filter, QTreeWidgetItem *pParent,
+                                       QList<QTreeWidgetItem*> &filteredItemList)
 {
     if (!pParent)
@@ -459 +486 @@
         filterItemsInternal(filter, pParent->child(i), filteredItemList);
 }
-
-void QITreeWidget::paintEvent(QPaintEvent *pEvent)
-{
-    /* Create item painter: */
-    QPainter painter;
-    painter.begin(viewport());
-
-    /* Notify listeners about painting: */
-    QTreeWidgetItemIterator it(this);
-    while (*it)
-    {
-        emit painted(*it, &painter);
-        ++it;
-    }
-
-    /* Close item painter: */
-    painter.end();
-
-    /* Call to base-class: */
-    QTreeWidget::paintEvent(pEvent);
-}
-
-void QITreeWidget::resizeEvent(QResizeEvent *pEvent)
-{
-    /* Call to base-class: */
-    QTreeWidget::resizeEvent(pEvent);
-
-    /* Notify listeners about resizing: */
-    emit resized(pEvent->size(), pEvent->oldSize());
-}

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.h

@@ -32 +32 @@
 class QITreeWidget;
 
-/** A functor base to be passed to QITabWidget::filterItems(..). Overload operator()(..) to filter out
- *  tree items. */
+/** A functor base to be passed to QITabWidget::filterItems(..).
+  * Overload operator()(..) to filter out tree items. */
 class SHARED_LIBRARY_STUFF QITreeWidgetItemFilter
 {
 public:
+
+    /** Destructs item filter. */
     virtual ~QITreeWidgetItemFilter() { /* Make VC++ 19.2 happy. */ }
+
+    /** Returns whether item can pass the filter. */
     virtual bool operator()(QTreeWidgetItem*) const
     {
@@ -97 +101 @@
     void resized(const QSize &size, const QSize &oldSize);
 
- public:
+public:
 
     /** Constructs tree-widget passing @a pParent to the base-class. */
@@ -109 +113 @@
     /** Returns the child item with @a iIndex. */
     QITreeWidgetItem *childItem(int iIndex) const;
+    /** Returns a model-index of @a pItem specified. */
     QModelIndex itemIndex(QTreeWidgetItem *pItem);
-    /** Recurses thru the subtree with a root pParent and returns a list of tree items filtered by @a filter.
-     *  When @a pParent is null than QTreeWidget::invisibleRootItem() is used as the root item. */
-    QList<QTreeWidgetItem*> filterItems(const QITreeWidgetItemFilter &filter, QTreeWidgetItem* pParent = 0);
+    /** Recurses thru the subtree with a root @a pParent and returns a list of tree-items filtered by @a filter.
+      * When @a pParent is null then QTreeWidget::invisibleRootItem() is used as the root item. */
+    QList<QTreeWidgetItem*> filterItems(const QITreeWidgetItemFilter &filter, QTreeWidgetItem *pParent = 0);
 
 protected:
@@ -121 +126 @@
     void resizeEvent(QResizeEvent *pEvent);
 
- private:
+private:
 
-    /* Recurses thru the tree and append filtered items to @a filteredItemList. */
-    void filterItemsInternal(const QITreeWidgetItemFilter &filter, QTreeWidgetItem* pParent,
+    /** Recurses thru the subtree with a root @a pParent and appends a
+      * list of tree-items filtered by @a filter to @a filteredItemList. */
+    void filterItemsInternal(const QITreeWidgetItemFilter &filter, QTreeWidgetItem *pParent,
                              QList<QTreeWidgetItem*> &filteredItemList);
 };