From 18d33e5d91908af42bcb7391e1d0468191683a28 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 13 Jun 2018 13:02:42 +0200 Subject: [PATCH] Return early - minimize if indentation --- src/IncrementalSearchBar.cpp | 50 +++++++++++++++++------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/src/IncrementalSearchBar.cpp b/src/IncrementalSearchBar.cpp index 7fd1d21d..be2c9256 100644 --- a/src/IncrementalSearchBar.cpp +++ b/src/IncrementalSearchBar.cpp @@ -195,32 +195,30 @@ void IncrementalSearchBar::setSearchText(const QString &text) bool IncrementalSearchBar::eventFilter(QObject *watched, QEvent *event) { - if (watched == _searchEdit) { - if (event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast(event); - - if (keyEvent->key() == Qt::Key_Escape) { - emit closeClicked(); - return true; - } - - if (keyEvent->key() == Qt::Key_Return && !keyEvent->modifiers()) { - _findNextButton->click(); - return true; - } - - if ((keyEvent->key() == Qt::Key_Return) - && (keyEvent->modifiers() == Qt::ShiftModifier)) { - _findPreviousButton->click(); - return true; - } - - if ((keyEvent->key() == Qt::Key_Return) - && (keyEvent->modifiers() == Qt::ControlModifier)) { - _searchFromButton->click(); - return true; - } - } + if ((event->type() != QEvent::KeyPress) || watched != _searchEdit) + return QWidget::eventFilter(watched, event); + + QKeyEvent *keyEvent = static_cast(event); + if (keyEvent->key() == Qt::Key_Escape) { + emit closeClicked(); + return true; + } + + if (keyEvent->key() == Qt::Key_Return && !keyEvent->modifiers()) { + _findNextButton->click(); + return true; + } + + if ((keyEvent->key() == Qt::Key_Return) + && (keyEvent->modifiers() == Qt::ShiftModifier)) { + _findPreviousButton->click(); + return true; + } + + if ((keyEvent->key() == Qt::Key_Return) + && (keyEvent->modifiers() == Qt::ControlModifier)) { + _searchFromButton->click(); + return true; } return QWidget::eventFilter(watched, event);