X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/67ebd66f94356b4e66005b1072919cb7b5e858bb..38c34eeca:/src/filterbar/filterbar.cpp diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 7eee08b2e..76e23d420 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -12,12 +12,11 @@ #include #include -#include #include #include -FilterBar::FilterBar(QWidget* parent) : - QWidget(parent) +FilterBar::FilterBar(QWidget *parent) + : QWidget(parent) { // Create button to lock text when changing folders m_lockButton = new QToolButton(this); @@ -27,14 +26,12 @@ FilterBar::FilterBar(QWidget* parent) : m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders")); connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton); - // Create filter editor m_filterInput = new QLineEdit(this); m_filterInput->setLayoutDirection(Qt::LeftToRight); m_filterInput->setClearButtonEnabled(true); m_filterInput->setPlaceholderText(i18n("Filter...")); - connect(m_filterInput, &QLineEdit::textChanged, - this, &FilterBar::filterChanged); + connect(m_filterInput, &QLineEdit::textChanged, this, &FilterBar::filterChanged); setFocusProxy(m_filterInput); // Create close button @@ -45,7 +42,7 @@ FilterBar::FilterBar(QWidget* parent) : connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest); // Apply layout - QHBoxLayout* hLayout = new QHBoxLayout(this); + QHBoxLayout *hLayout = new QHBoxLayout(this); hLayout->setContentsMargins(0, 0, 0, 0); hLayout->addWidget(m_lockButton); hLayout->addWidget(m_filterInput); @@ -75,7 +72,7 @@ void FilterBar::clear() m_filterInput->clear(); } -void FilterBar::slotUrlChanged() +void FilterBar::clearIfUnlocked() { if (!m_lockButton || !(m_lockButton->isChecked())) { clear(); @@ -92,21 +89,21 @@ void FilterBar::slotToggleLockButton(bool checked) } } -void FilterBar::showEvent(QShowEvent* event) +void FilterBar::showEvent(QShowEvent *event) { if (!event->spontaneous()) { m_filterInput->setFocus(); } } -void FilterBar::keyReleaseEvent(QKeyEvent* event) +void FilterBar::keyReleaseEvent(QKeyEvent *event) { QWidget::keyReleaseEvent(event); switch (event->key()) { case Qt::Key_Escape: if (m_filterInput->text().isEmpty()) { - emit closeRequest(); + Q_EMIT closeRequest(); } else { m_filterInput->clear(); } @@ -114,11 +111,10 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event) case Qt::Key_Enter: case Qt::Key_Return: - emit focusViewRequest(); + Q_EMIT focusViewRequest(); break; default: break; } } -