1 files changed, 28 insertions, 14 deletions
diff --git a/src/library/analysisfeature.cpp b/src/library/analysisfeature.cpp
index 779eed475d..2eeff2b019 100644
--- a/src/library/analysisfeature.cpp
+++ b/src/library/analysisfeature.cpp
@@ -86,20 +86,34 @@ void AnalysisFeature::bindWidget(WLibrary* libraryWidget,
     m_pAnalysisView = new DlgAnalysis(libraryWidget,
                                       m_pConfig,
                                       m_library);
-    connect(m_pAnalysisView, SIGNAL(loadTrack(TrackPointer)),
-            this, SIGNAL(loadTrack(TrackPointer)));
-    connect(m_pAnalysisView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
-            this, SIGNAL(loadTrackToPlayer(TrackPointer, QString)));
-    connect(m_pAnalysisView, SIGNAL(analyzeTracks(QList<TrackId>)),
-            this, SLOT(analyzeTracks(QList<TrackId>)));
-    connect(m_pAnalysisView, SIGNAL(stopAnalysis()),
-            this, SLOT(stopAnalysis()));
-
-    connect(m_pAnalysisView, SIGNAL(trackSelected(TrackPointer)),
-            this, SIGNAL(trackSelected(TrackPointer)));
-
-    connect(this, SIGNAL(analysisActive(bool)),
-            m_pAnalysisView, SLOT(slotAnalysisActive(bool)));
+    connect(m_pAnalysisView,
+            &DlgAnalysis::loadTrack,
+            this,
+            &AnalysisFeature::loadTrack);
+    connect(m_pAnalysisView,
+            &DlgAnalysis::loadTrackToPlayer,
+            this,
+            [=](TrackPointer track, QString group) {
+                emit loadTrackToPlayer(track, group, false);
+            });
+    connect(m_pAnalysisView,
+            &DlgAnalysis::analyzeTracks,
+            this,
+            &AnalysisFeature::analyzeTracks);
+    connect(m_pAnalysisView,
+            &DlgAnalysis::stopAnalysis,
+            this,
+            &AnalysisFeature::stopAnalysis);
+
+    connect(m_pAnalysisView,
+            &DlgAnalysis::trackSelected,
+            this,
+            &AnalysisFeature::trackSelected);
+
+    connect(this,
+            &AnalysisFeature::analysisActive,
+            m_pAnalysisView,
+            &DlgAnalysis::slotAnalysisActive);
 
     m_pAnalysisView->installEventFilter(keyboard);