dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Connection syntax migration (#637)

Browse Source
This commit is contained in:
Jonas Kvinge
2021-01-26 16:48:04 +01:00
committed by GitHub
parent d57f6303f4
commit bf7c8df353
362 changed files with 2452 additions and 2434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/musicbrainz/acoustidclient.cpp
View File

@@ -88,7 +88,7 @@ void AcoustidClient::Start(const int id, const QString &fingerprint, int duratio
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
QNetworkReply *reply = network_->get(req);
connect(reply, &QNetworkReply::finished, [=] { RequestFinished(reply, id); });
QObject::connect(reply, &QNetworkReply::finished, [this, reply, id]() { RequestFinished(reply, id); });
requests_[id] = reply;
timeouts_->AddReply(reply);
@@ -126,7 +126,7 @@ struct IdSource {
void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id) {
disconnect(reply, nullptr, this, nullptr);
QObject::disconnect(reply, nullptr, this, nullptr);
reply->deleteLater();
requests_.remove(request_id);

3
src/musicbrainz/acoustidclient.h
View File

@@ -58,7 +58,7 @@ class AcoustidClient : public QObject {
void CancelAll();
signals:
void Finished(const int id, const QStringList &mbid_list, const QString &error = QString());
void Finished(int id, QStringList mbid_list, QString error = QString());
private slots:
void RequestFinished(QNetworkReply *reply, const int id);
@@ -75,4 +75,3 @@ class AcoustidClient : public QObject {
};
#endif // ACOUSTIDCLIENT_H

16
src/musicbrainz/musicbrainzclient.cpp
View File

@@ -66,7 +66,7 @@ MusicBrainzClient::MusicBrainzClient(QObject *parent, QNetworkAccessManager *net
timer_flush_requests_->setInterval(kRequestsDelay);
timer_flush_requests_->setSingleShot(true);
connect(timer_flush_requests_, SIGNAL(timeout()), this, SLOT(FlushRequests()));
QObject::connect(timer_flush_requests_, &QTimer::timeout, this, &MusicBrainzClient::FlushRequests);
}
@@ -121,7 +121,7 @@ void MusicBrainzClient::Cancel(int id) {
while (!requests_.isEmpty() && requests_.contains(id)) {
QNetworkReply *reply = requests_.take(id);
disconnect(reply, nullptr, this, nullptr);
QObject::disconnect(reply, nullptr, this, nullptr);
if (reply->isRunning()) reply->abort();
reply->deleteLater();
}
@@ -167,7 +167,7 @@ void MusicBrainzClient::StartDiscIdRequest(const QString &discid) {
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
QNetworkReply *reply = network_->get(req);
connect(reply, &QNetworkReply::finished, [=] { DiscIdRequestFinished(discid, reply); });
QObject::connect(reply, &QNetworkReply::finished, [this, discid, reply]() { DiscIdRequestFinished(discid, reply); });
timeouts_->AddReply(reply);
@@ -193,7 +193,7 @@ void MusicBrainzClient::FlushRequests() {
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
QNetworkReply *reply = network_->get(req);
connect(reply, &QNetworkReply::finished, [=] { RequestFinished(reply, request.id, request.number); });
QObject::connect(reply, &QNetworkReply::finished, [this, reply, request]() { RequestFinished(reply, request.id, request.number); });
requests_.insert(request.id, reply);
timeouts_->AddReply(reply);
@@ -202,7 +202,7 @@ void MusicBrainzClient::FlushRequests() {
void MusicBrainzClient::RequestFinished(QNetworkReply *reply, const int id, const int request_number) {
disconnect(reply, nullptr, this, nullptr);
QObject::disconnect(reply, nullptr, this, nullptr);
reply->deleteLater();
const int nb_removed = requests_.remove(id, reply);
@@ -248,7 +248,7 @@ void MusicBrainzClient::RequestFinished(QNetworkReply *reply, const int id, cons
void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkReply *reply) {
disconnect(reply, nullptr, this, nullptr);
QObject::disconnect(reply, nullptr, this, nullptr);
reply->deleteLater();
ResultList ret;
@@ -259,7 +259,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep
QString error;
QByteArray data = GetReplyData(reply, error);
if (data.isEmpty()) {
emit Finished(artist, album, ret, error);
emit DiscIdFinished(artist, album, ret, error);
return;
}
@@ -323,7 +323,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep
}
}
emit Finished(artist, album, UniqueResults(ret, SortResults));
emit DiscIdFinished(artist, album, UniqueResults(ret, SortResults));
}

4
src/musicbrainz/musicbrainzclient.h
View File

@@ -101,9 +101,9 @@ class MusicBrainzClient : public QObject {
signals:
// Finished signal emitted when fechting songs tags
void Finished(const int id, const MusicBrainzClient::ResultList &result, const QString &error = QString());
void Finished(int id, MusicBrainzClient::ResultList result, QString error = QString());
// Finished signal emitted when fechting album's songs tags using DiscId
void Finished(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &result, const QString &error = QString());
void DiscIdFinished(QString artist, QString album, MusicBrainzClient::ResultList result, QString error = QString());
private slots:
void FlushRequests();

12
src/musicbrainz/tagfetcher.cpp
View File

@@ -39,8 +39,8 @@ TagFetcher::TagFetcher(QObject *parent)
acoustid_client_(new AcoustidClient(this)),
musicbrainz_client_(new MusicBrainzClient(this)) {
connect(acoustid_client_, SIGNAL(Finished(int, QStringList, QString)), SLOT(PuidsFound(int, QStringList, QString)));
connect(musicbrainz_client_, SIGNAL(Finished(int, MusicBrainzClient::ResultList, QString)), SLOT(TagsFetched(int, MusicBrainzClient::ResultList, QString)));
QObject::connect(acoustid_client_, &AcoustidClient::Finished, this, &TagFetcher::PuidsFound);
QObject::connect(musicbrainz_client_, &MusicBrainzClient::Finished, this, &TagFetcher::TagsFetched);
}
@@ -57,7 +57,7 @@ void TagFetcher::StartFetch(const SongList &songs) {
QFuture<QString> future = QtConcurrent::mapped(songs_, GetFingerprint);
fingerprint_watcher_ = new QFutureWatcher<QString>(this);
fingerprint_watcher_->setFuture(future);
connect(fingerprint_watcher_, SIGNAL(resultReadyAt(int)), SLOT(FingerprintFound(int)));
QObject::connect(fingerprint_watcher_, &QFutureWatcher<QString>::resultReadyAt, this, &TagFetcher::FingerprintFound);
for (const Song &song : songs) {
emit Progress(song, tr("Fingerprinting song"));
@@ -70,7 +70,7 @@ void TagFetcher::Cancel() {
if (fingerprint_watcher_) {
fingerprint_watcher_->cancel();
delete fingerprint_watcher_;
fingerprint_watcher_->deleteLater();
fingerprint_watcher_ = nullptr;
}
@@ -83,9 +83,7 @@ void TagFetcher::Cancel() {
void TagFetcher::FingerprintFound(const int index) {
QFutureWatcher<QString>* watcher = reinterpret_cast<QFutureWatcher<QString>*>(sender());
if (!watcher || index >= songs_.count()) {
return;
}
if (!watcher || index >= songs_.count()) return;
const QString fingerprint = watcher->resultAt(index);
const Song &song = songs_[index];

4
src/musicbrainz/tagfetcher.h
View File

@@ -47,8 +47,8 @@ class TagFetcher : public QObject {
void Cancel();
signals:
void Progress(const Song &original_song, const QString &stage);
void ResultAvailable(const Song &original_song, const SongList &songs_guessed, const QString &error = QString());
void Progress(Song original_song, QString stage);
void ResultAvailable(Song original_song, SongList songs_guessed, QString error = QString());
private slots:
void FingerprintFound(const int index);