Changeset 77980 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 1, 2019 5:31:43 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129745

Message:

FE/Qt: bugref:9378: Few coding-style fixes for UIChooserView code.

Location:

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

Files:

• UIChooserView.cpp (modified) (10 diffs)
• UIChooserView.h (modified) (2 diffs)

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

@@ -106 +106 @@
     if (!m_pSearchWidget)
         return false;
+
+    /* Return widget visibility state: */
     return m_pSearchWidget->isVisible();
 }
@@ -114 +116 @@
         return;
 
-    /* Make sure keyboard focus is managed ccorectly: */
+    /* Make sure keyboard focus is managed correctly: */
     if (fVisible)
         m_pSearchWidget->setFocus();
@@ -120 +122 @@
         setFocus();
 
+    /* Make sure visibility state is really changed: */
     if (m_pSearchWidget->isVisible() == fVisible)
         return;
+
+    /* Set widget visibility state: */
     m_pSearchWidget->setVisible(fVisible);
+
+    /* Update geometry if widget is visible: */
     if (m_pSearchWidget->isVisible())
         updateSearchWidgetGeometry();
 
-    UIChooserModel *pModel =  m_pChooser->model();
+    /* Reset search each time widget visibility changed: */
+    UIChooserModel *pModel = m_pChooser->model();
     if (pModel)
         pModel->resetSearch();
@@ -135 +143 @@
     if (!m_pSearchWidget)
         return;
+
     m_pSearchWidget->setMatchCount(iTotalMacthCount);
     m_pSearchWidget->setScroolToIndex(iCurrentlyScrolledItemIndex);
@@ -141 +150 @@
 void UIChooserView::appendToSearchString(const QString &strSearchText)
 {
-    if (m_pSearchWidget)
-        m_pSearchWidget->appendToSearchString(strSearchText);
+    if (!m_pSearchWidget)
+        return;
+
+    m_pSearchWidget->appendToSearchString(strSearchText);
 }
 
@@ -165 +176 @@
     if (!m_pChooser)
         return;
-
     UIChooserModel *pModel =  m_pChooser->model();
     if (!pModel)
         return;
+
     pModel->performSearch(strSearchTerm, iItemSearchFlags);
 }
@@ -174 +185 @@
 void UIChooserView::sltHandleScrollToSearchResult(bool fIsNext)
 {
+    if (!m_pChooser)
+        return;
     UIChooserModel *pModel =  m_pChooser->model();
     if (!pModel)
         return;
+
     pModel->selectSearchResult(fIsNext);
 }
@@ -214 +228 @@
     m_pSearchWidget->hide();
     connect(m_pSearchWidget, &UIChooserSearchWidget::sigRedoSearch,
-                this, &UIChooserView::sltRedoSearch);
+            this, &UIChooserView::sltRedoSearch);
     connect(m_pSearchWidget, &UIChooserSearchWidget::sigScrollToMatch,
-                this, &UIChooserView::sltHandleScrollToSearchResult);
+            this, &UIChooserView::sltHandleScrollToSearchResult);
     connect(m_pSearchWidget, &UIChooserSearchWidget::sigToggleVisibility,
-                this, &UIChooserView::sltHandleSearchWidgetVisibilityToggle);
+            this, &UIChooserView::sltHandleSearchWidgetVisibilityToggle);
 
     /* Update scene-rect: */
     updateSceneRect();
-
     /* Update the location and size of the search widget: */
     updateSearchWidgetGeometry();
@@ -248 +261 @@
     /* Update scene-rect: */
     updateSceneRect();
+    /* Update the location and size of the search widget: */
     updateSearchWidgetGeometry();
 }
@@ -260 +274 @@
     if (!m_pSearchWidget || !m_pSearchWidget->isVisible())
         return;
-    int iHeight = m_pSearchWidget->height();
-    QRect widgetRect(0, height() - iHeight,
-                     width(), iHeight);
-    m_pSearchWidget->setGeometry(widgetRect);
-}
+
+    const int iHeight = m_pSearchWidget->height();
+    m_pSearchWidget->setGeometry(QRect(0, height() - iHeight, width(), iHeight));
+}

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

@@ -52 +52 @@
     /** @} */
 
-    /** @name Virtual Machine search stuff.
+    /** @name Search stuff.
       * @{ */
         /** Returns if the search widget is visible or not. */
@@ -107 +107 @@
     /** @} */
 
-    /** @name Virtual Machine search stuff.
+    /** @name Search stuff.
       * @{ */
         /** Updates search widget's geometry. */