Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace closures with connect variant. 

Qt5 introduced new connect variants that allow calling a functor. A lambda can
replace the user of the Closure class in this case.
This commit is contained in:
Jim Broadus 2020-02-12 23:44:08 -08:00 committed by John Maguire
parent b3ec030ae4
commit 941e139a18
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/songinfo/songkickconcerts.cpp
View File

@ -26,7 +26,6 @@
#include <QUrl>
#include <QUrlQuery>
#include "core/closure.h"
#include "core/logging.h"
#include "songkickconcertwidget.h"
#include "ui/iconloader.h"
@ -62,8 +61,8 @@ void SongkickConcerts::FetchInfo(int id, const Song& metadata) {
QNetworkRequest request(url);
QNetworkReply* reply = network_.get(request);
NewClosure(reply, SIGNAL(finished()), this,
SLOT(ArtistSearchFinished(QNetworkReply*, int)), reply, id);
connect(reply, &QNetworkReply::finished,
[=] { this->ArtistSearchFinished(reply, id); });
}
void SongkickConcerts::ArtistSearchFinished(QNetworkReply* reply, int id) {
@ -111,8 +110,8 @@ void SongkickConcerts::FetchSongkickCalendar(const QString& artist_id, int id) {
url.setQuery(url_query);
qLog(Debug) << url;
QNetworkReply* reply = network_.get(QNetworkRequest(url));
NewClosure(reply, SIGNAL(finished()), this,
SLOT(CalendarRequestFinished(QNetworkReply*, int)), reply, id);
connect(reply, &QNetworkReply::finished,
[=] { this->CalendarRequestFinished(reply, id); });
}
void SongkickConcerts::CalendarRequestFinished(QNetworkReply* reply, int id) {