From 1f488db55087b124dd428df0950b0d41a62c33eb Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Sun, 2 Feb 2020 12:25:03 +0100
Subject: Pass-through of search signals

---
 src/library/library.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/library/library.cpp')

diff --git a/src/library/library.cpp b/src/library/library.cpp
index 7d43072e53..ea53afcb16 100644
--- a/src/library/library.cpp
+++ b/src/library/library.cpp
@@ -367,11 +367,11 @@ void Library::addFeature(LibraryFeature* feature) {
     connect(feature,
             &LibraryFeature::restoreSearch,
             this,
-            &Library::slotRestoreSearch);
+            &Library::restoreSearch); // forward signal
     connect(feature,
             &LibraryFeature::disableSearch,
             this,
-            &Library::slotDisableSearch);
+            &Library::disableSearch); // forward signal
     connect(feature,
             &LibraryFeature::enableCoverArtDisplay,
             this,
@@ -427,14 +427,6 @@ void Library::slotLoadTrackToPlayer(TrackPointer pTrack, QString group, bool pla
     emit loadTrackToPlayer(pTrack, group, play);
 }
 
-void Library::slotRestoreSearch(const QString& text) {
-    emit restoreSearch(text);
-}
-
-void Library::slotDisableSearch() {
-    emit disableSearch();
-}
-
 void Library::slotRefreshLibraryModels() {
    m_pMixxxLibraryFeature->refreshLibraryModels();
    m_pAnalysisFeature->refreshLibraryModels();
-- 
cgit v1.2.3


From b8610ec6f0f7592ffb8211153d1be285fc0ae344 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Mon, 10 Feb 2020 21:53:37 +0100
Subject: Fix Library -> WSearchLineEdit connections

---
 src/library/library.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/library/library.cpp')

diff --git a/src/library/library.cpp b/src/library/library.cpp
index ea53afcb16..9d8c98df53 100644
--- a/src/library/library.cpp
+++ b/src/library/library.cpp
@@ -228,14 +228,14 @@ void Library::bindSearchboxWidget(WSearchLineEdit* pSearchboxWidget) {
             &WSearchLineEdit::search,
             this,
             &Library::search);
-    connect(pSearchboxWidget,
-            &WSearchLineEdit::disableSearch,
-            this,
-            &Library::disableSearch);
-    connect(pSearchboxWidget,
-            &WSearchLineEdit::restoreSearch,
-            this,
-            &Library::restoreSearch);
+    connect(this,
+            &Library::disableSearch,
+            pSearchboxWidget,
+            &WSearchLineEdit::disableSearch);
+    connect(this,
+            &Library::restoreSearch,
+            pSearchboxWidget,
+            &WSearchLineEdit::restoreSearch);
     connect(this,
             &Library::setTrackTableFont,
             pSearchboxWidget,
-- 
cgit v1.2.3