diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-05-05 08:19:27 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2020-05-05 08:31:30 +0200 |
commit | 8a75a61f0ef8bced0d705fee27fbee2f04c7106a (patch) | |
tree | 3a1a9dc5bccb5efeee13bc3fb49dad4d9c0fd5e3 | |
parent | 95863f8cb67e0f38e665177f0dd1cb06a0e6c05e (diff) |
Rename slots according to naming conventions
-rw-r--r-- | src/library/library.cpp | 4 | ||||
-rw-r--r-- | src/library/librarycontrol.cpp | 2 | ||||
-rw-r--r-- | src/widget/wsearchlineedit.cpp | 51 | ||||
-rw-r--r-- | src/widget/wsearchlineedit.h | 15 |
4 files changed, 33 insertions, 39 deletions
diff --git a/src/library/library.cpp b/src/library/library.cpp index a685199bb9..136c92c4cb 100644 --- a/src/library/library.cpp +++ b/src/library/library.cpp @@ -236,11 +236,11 @@ void Library::bindSearchboxWidget(WSearchLineEdit* pSearchboxWidget) { connect(this, &Library::disableSearch, pSearchboxWidget, - &WSearchLineEdit::disableSearch); + &WSearchLineEdit::slotDisableSearch); connect(this, &Library::restoreSearch, pSearchboxWidget, - &WSearchLineEdit::restoreSearch); + &WSearchLineEdit::slotRestoreSearch); connect(this, &Library::setTrackTableFont, pSearchboxWidget, diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp index 9eabf573cd..d1e9d6579f 100644 --- a/src/library/librarycontrol.cpp +++ b/src/library/librarycontrol.cpp @@ -335,7 +335,7 @@ void LibraryControl::bindSearchboxWidget(WSearchLineEdit* pSearchbox) { connect(this, &LibraryControl::clearSearchIfClearButtonHasFocus, m_pSearchbox, - &WSearchLineEdit::clearSearchIfClearButtonHasFocus); + &WSearchLineEdit::slotClearSearchIfClearButtonHasFocus); connect(m_pSearchbox, &WSearchLineEdit::destroyed, this, diff --git a/src/widget/wsearchlineedit.cpp b/src/widget/wsearchlineedit.cpp index b59f9d664b..195292f7dd 100644 --- a/src/widget/wsearchlineedit.cpp +++ b/src/widget/wsearchlineedit.cpp @@ -92,7 +92,7 @@ WSearchLineEdit::WSearchLineEdit(QWidget* pParent) connect(m_clearButton, &QAbstractButton::clicked, this, - &WSearchLineEdit::clearSearch); + &WSearchLineEdit::slotClearSearch); // This prevents the searchbox from being focused by Tab key (real or emulated) // so it is skipped when using the library controls 'MoveFocus[...]' @@ -102,7 +102,7 @@ WSearchLineEdit::WSearchLineEdit(QWidget* pParent) connect(setFocusShortcut, &QShortcut::activated, this, - &WSearchLineEdit::setShortcutFocus); + &WSearchLineEdit::slotSetShortcutFocus); // Set up a timer to search after a few hundred milliseconds timeout. This // stops us from thrashing the database if you type really fast. @@ -110,19 +110,19 @@ WSearchLineEdit::WSearchLineEdit(QWidget* pParent) connect(&m_debouncingTimer, &QTimer::timeout, this, - &WSearchLineEdit::triggerSearch); + &WSearchLineEdit::slotTriggerSearch); connect(this, &QLineEdit::textChanged, this, - &WSearchLineEdit::updateText); + &WSearchLineEdit::slotTextChanged); // When you hit enter, it will trigger or clear the search. connect(this, &QLineEdit::returnPressed, this, [this] { - if (!clearSearchIfClearButtonHasFocus()) { - triggerSearch(); + if (!slotClearSearchIfClearButtonHasFocus()) { + slotTriggerSearch(); } }); @@ -291,7 +291,7 @@ void WSearchLineEdit::focusOutEvent(QFocusEvent* event) { // Trigger a pending search before leaving the edit box. // Otherwise the entered text might be ignored and get lost // due to the debouncing timeout! - triggerSearch(); + slotTriggerSearch(); } switchState(State::Inactive); if (getSearchText().isEmpty()) { @@ -310,11 +310,10 @@ void WSearchLineEdit::setTextBlockSignals(const QString& text) { blockSignals(false); } -// slot -void WSearchLineEdit::disableSearch() { +void WSearchLineEdit::slotDisableSearch() { #if ENABLE_TRACE_LOG kLogger.trace() - << "disableSearch"; + << "slotDisableSearch"; #endif // ENABLE_TRACE_LOG if (!isEnabled()) { return; @@ -338,25 +337,23 @@ void WSearchLineEdit::enableSearch(const QString& text) { updateEditBox(text); } -// slot -void WSearchLineEdit::restoreSearch(const QString& text) { +void WSearchLineEdit::slotRestoreSearch(const QString& text) { #if ENABLE_TRACE_LOG kLogger.trace() - << "restoreSearch" + << "slotRestoreSearch" << text; #endif // ENABLE_TRACE_LOG if (text.isNull()) { - disableSearch(); + slotDisableSearch(); } else { enableSearch(text); } } -// slot -void WSearchLineEdit::triggerSearch() { +void WSearchLineEdit::slotTriggerSearch() { #if ENABLE_TRACE_LOG kLogger.trace() - << "triggerSearch" + << "slotTriggerSearch" << getSearchText(); #endif // ENABLE_TRACE_LOG DEBUG_ASSERT(isEnabled()); @@ -409,7 +406,7 @@ void WSearchLineEdit::refreshEditBox() { if (isEnabled()) { enableSearch(getSearchText()); } else { - disableSearch(); + slotDisableSearch(); } } @@ -454,11 +451,10 @@ bool WSearchLineEdit::event(QEvent* pEvent) { return QLineEdit::event(pEvent); } -// slot -void WSearchLineEdit::clearSearch() { +void WSearchLineEdit::slotClearSearch() { #if ENABLE_TRACE_LOG kLogger.trace() - << "clearSearch"; + << "slotClearSearch"; #endif // ENABLE_TRACE_LOG DEBUG_ASSERT(isEnabled()); // Clearing the edit field will engage the debouncing timer @@ -471,20 +467,18 @@ void WSearchLineEdit::clearSearch() { setFocus(Qt::OtherFocusReason); } -// slot -bool WSearchLineEdit::clearSearchIfClearButtonHasFocus() { +bool WSearchLineEdit::slotClearSearchIfClearButtonHasFocus() { if (!m_clearButton->hasFocus()) { return false; } - clearSearch(); + slotClearSearch(); return true; } -// slot -void WSearchLineEdit::updateText(const QString& text) { +void WSearchLineEdit::slotTextChanged(const QString& text) { #if ENABLE_TRACE_LOG kLogger.trace() - << "updateText" + << "slotTextChanged" << text; #endif // ENABLE_TRACE_LOG m_debouncingTimer.stop(); @@ -504,8 +498,7 @@ void WSearchLineEdit::updateText(const QString& text) { } } -// slot -void WSearchLineEdit::setShortcutFocus() { +void WSearchLineEdit::slotSetShortcutFocus() { setFocus(Qt::ShortcutFocusReason); } diff --git a/src/widget/wsearchlineedit.h b/src/widget/wsearchlineedit.h index ef0f4ddb5d..5b6d507f21 100644 --- a/src/widget/wsearchlineedit.h +++ b/src/widget/wsearchlineedit.h @@ -49,18 +49,19 @@ class WSearchLineEdit : public QLineEdit, public WBaseWidget { void search(const QString& text); public slots: - void restoreSearch(const QString& text); - void disableSearch(); void slotSetFont(const QFont& font); - void clearSearch(); - bool clearSearchIfClearButtonHasFocus(); + void slotRestoreSearch(const QString& text); + void slotDisableSearch(); + + void slotClearSearch(); + bool slotClearSearchIfClearButtonHasFocus(); private slots: - void setShortcutFocus(); - void updateText(const QString& text); + void slotSetShortcutFocus(); + void slotTextChanged(const QString& text); - void triggerSearch(); + void slotTriggerSearch(); private: // TODO(XXX): This setting shouldn't be static and the widget |