From 819800d3a415ceb5898f640af6e2715e89bca44b Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 28 Jan 2021 21:22:50 +0100
Subject: [PATCH] Revert some lambda connects back to NewClosure

---
 src/moodbar/moodbarcontroller.cpp   | 3 ++-
 src/moodbar/moodbaritemdelegate.cpp | 2 +-
 src/moodbar/moodbarloader.cpp       | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/moodbar/moodbarcontroller.cpp b/src/moodbar/moodbarcontroller.cpp
index 032025992..67f146995 100644
--- a/src/moodbar/moodbarcontroller.cpp
+++ b/src/moodbar/moodbarcontroller.cpp
@@ -24,6 +24,7 @@
 #include "core/application.h"
 #include "core/player.h"
 #include "core/song.h"
+#include "core/closure.h"
 #include "engine/engine_fwd.h"
 #include "settings/moodbarsettingspage.h"
 #include "playlist/playlistmanager.h"
@@ -75,7 +76,7 @@ void MoodbarController::CurrentSongChanged(const Song &song) {
       // bar.  Our slot will be called when the data is actually loaded.
       emit CurrentMoodbarDataChanged(QByteArray());
 
-      QObject::connect(pipeline, &MoodbarPipeline::Finished, [this, pipeline, song]() { AsyncLoadComplete(pipeline, song.url()); });
+      NewClosure(pipeline, SIGNAL(Finished(bool)), this, SLOT(AsyncLoadComplete(MoodbarPipeline*, QUrl)), pipeline, song.url());
       break;
   }
 
diff --git a/src/moodbar/moodbaritemdelegate.cpp b/src/moodbar/moodbaritemdelegate.cpp
index 4d71df17f..9f9c8e82a 100644
--- a/src/moodbar/moodbaritemdelegate.cpp
+++ b/src/moodbar/moodbaritemdelegate.cpp
@@ -145,7 +145,7 @@ void MoodbarItemDelegate::StartLoadingData(const QUrl &url, Data *data) {
 
     case MoodbarLoader::WillLoadAsync:
       // Maybe in a little while.
-      QObject::connect(pipeline, &MoodbarPipeline::Finished, [this, url, pipeline]() { DataLoaded(url, pipeline); });
+      NewClosure(pipeline, SIGNAL(Finished(bool)), this, SLOT(DataLoaded(QUrl, MoodbarPipeline*)), url, pipeline);
       break;
   }
 
diff --git a/src/moodbar/moodbarloader.cpp b/src/moodbar/moodbarloader.cpp
index f07bf94f8..470e4b953 100644
--- a/src/moodbar/moodbarloader.cpp
+++ b/src/moodbar/moodbarloader.cpp
@@ -39,6 +39,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
+#include "core/closure.h"
 #include "core/logging.h"
 
 #include "moodbarpipeline.h"
@@ -129,7 +130,7 @@ MoodbarLoader::Result MoodbarLoader::Load(const QUrl &url, QByteArray *data, Moo
   // There was no existing file, analyze the audio file and create one.
   MoodbarPipeline *pipeline = new MoodbarPipeline(url);
   pipeline->moveToThread(thread_);
-  QObject::connect(pipeline, &MoodbarPipeline::Finished, [this, pipeline, url]() { RequestFinished(pipeline, url); });
+  NewClosure(pipeline, SIGNAL(Finished(bool)), this, SLOT(RequestFinished(MoodbarPipeline*, QUrl)), pipeline, url);
 
   requests_[url] = pipeline;
   queued_requests_ << url;