Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp (revision 70474) @@ -195,5 +195,5 @@ void QIManagerDialog::prepareToolBar() { - if(!m_pWidgetToolbar) + if (!m_pWidgetToolbar) return; /* Enable unified toolbar on macOS: */ @@ -247,3 +247,2 @@ showMaximized(); } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp (revision 70474) @@ -221,5 +221,5 @@ } } - else if(pEvent->type() == QEvent::MouseMove) + else if (pEvent->type() == QEvent::MouseMove) { /* If we are in the near of the handle or currently @@ -291,3 +291,2 @@ #include "QISplitter.moc" - Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 70474) @@ -427,3 +427,2 @@ #endif // __UIMessageCenter_h__ - Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp (revision 70474) @@ -91,12 +91,13 @@ protected: - /* Overload the mouseXXXEvent to control how selection is made: */ + /* Overload the mouseXXXEvent to control how selection is done: */ virtual void mouseDoubleClickEvent(QMouseEvent *){} virtual void mouseMoveEvent(QMouseEvent *){} virtual void mousePressEvent(QMouseEvent * event) { - /* Simulate double mouse click to select a word with a single click. */ + /* Simulate double mouse click to select a word with a single click: */ QLineEdit::mouseDoubleClickEvent(event); } + virtual void mouseReleaseEvent(QMouseEvent *){} virtual void paintEvent(QPaintEvent *event) @@ -105,4 +106,6 @@ int clearButtonSize = height(); m_pClearAllButton->setGeometry(width() - clearButtonSize, 0, clearButtonSize, clearButtonSize); + /* If we have a selected term move the m_pRemoveTermButton to the end of the + or start of the word (depending on the location of the word within line edit itself: */ if (hasSelectedText()) { @@ -111,7 +114,7 @@ int buttonSize = 16; int charWidth = fontMetrics().width('x'); - int buttonLeft = cursorRect().right() - 0.5 * charWidth; - + /* If buttonLeft is in far left of the line edit, move the + button to left side of the selected word: */ if (buttonLeft + buttonSize >= width() - clearButtonSize) { @@ -119,5 +122,4 @@ buttonLeft -= (selectionWidth + buttonSize); } - m_pRemoveTermButton->setGeometry(buttonLeft, buttonY, buttonSize, buttonSize); } @@ -128,8 +130,8 @@ private slots: - /* Nofifies the listeners that selected word (filter term) has been removed. */ + /* Nofifies the listeners that selected word (filter term) has been removed: */ void sltRemoveFilterTerm() { - if(!hasSelectedText()) + if (!hasSelectedText()) return; emit sigFilterTermRemoved(selectedText()); @@ -138,8 +140,9 @@ } - /* The whole content is removed. Listeners are notified. */ + /* The whole content is removed. Listeners are notified: */ void sltClearAll() { - if(text().isEmpty()) + /* Check if we have some text to avoid recursive calls: */ + if (text().isEmpty()) return; @@ -278,7 +281,7 @@ void UIVMLogViewerFilterPanel::sltAddFilterTerm() { - if(!m_pFilterComboBox) - return; - if(m_pFilterComboBox->currentText().isEmpty()) + if (!m_pFilterComboBox) + return; + if (m_pFilterComboBox->currentText().isEmpty()) return; @@ -299,5 +302,5 @@ void UIVMLogViewerFilterPanel::sltClearFilterTerms() { - if(m_filterTermList.empty()) + if (m_filterTermList.empty()) return; m_filterTermList.clear(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.h (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.h (revision 70474) @@ -68,8 +68,10 @@ /** Clear all the filter terms and reset the filtering. */ void sltClearFilterTerms(); + /** Executes the necessary code to handle filter's boolean operator change ('And', 'Or'). */ void sltOperatorButtonChanged(int buttonId); void sltRemoveFilterTerm(const QString &termString); private: + enum FilterOperatorButton{ AndButton = 0, Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp (revision 70474) @@ -222,5 +222,5 @@ { /* Update snapshots pane is it is open: */ - if(isToolOpened(ToolTypeMachine_Snapshots)) + if (isToolOpened(ToolTypeMachine_Snapshots)) { AssertPtrReturnVoid(m_pPaneSnapshots); @@ -228,5 +228,5 @@ } /* Update logviewer pane is it is open: */ - if(isToolOpened(ToolTypeMachine_LogViewer)) + if (isToolOpened(ToolTypeMachine_LogViewer)) { AssertPtrReturnVoid(m_pPaneLogViewer); @@ -320,3 +320,2 @@ } } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp (revision 70474) @@ -128,5 +128,5 @@ /* Details-pane: */ - if(m_pDetailsPane->isVisible()) + if (m_pDetailsPane->isVisible()) { m_pDetailsPane->move(m_iLayoutMargin, @@ -537,3 +537,2 @@ } } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneDetails.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneDetails.cpp (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneDetails.cpp (revision 70474) @@ -219,5 +219,5 @@ int iNewHeight = m_iMaximumPaneHeight; QTextDocument *pTextDocument = m_pTextEdit->document(); - if(pTextDocument) + if (pTextDocument) { /* Adjust text-edit size: */ @@ -255,3 +255,2 @@ return font; } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp (revision 70473) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp (revision 70474) @@ -342,5 +342,5 @@ /* Search for existing status-bar child: */ if (QStatusBar *pStatusBar = pMainWindow->findChild()) - if(pStatusBar->isVisible()) + if (pStatusBar->isVisible()) return pStatusBar->height(); @@ -350,3 +350,2 @@ return 0; } -