Merge branch 'master' of github.com:mixxxdj/mixxx into serato-library-feature

1 files changed, 10 insertions, 18 deletions

diff --git a/src/library/library.cpp b/src/library/library.cpp
index 9ce88bb013..0c08e7df98 100644
--- a/src/library/library.cpp
+++ b/src/library/library.cpp
@@ -233,14 +233,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,
@@ -372,11 +372,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,
@@ -432,14 +432,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();