From a68d856074db6abaaa8a2f230bb1fc529a5988d3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 9 Nov 2021 20:48:43 +0100 Subject: [PATCH] AlbumCoverLoader: Change ID to quint64 --- src/covermanager/albumcoverloader.cpp | 26 +++++++++++++------------- src/covermanager/albumcoverloader.h | 16 ++++++++-------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp index 5b4134357..6af15a04d 100644 --- a/src/covermanager/albumcoverloader.cpp +++ b/src/covermanager/albumcoverloader.cpp @@ -549,7 +549,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, c QMutexLocker l(&mutex_save_image_async_); quint64 id = ++save_image_async_id_; - QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QString, song_filename), Q_ARG(QString, cover_filename)); + QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QString, song_filename), Q_ARG(QString, cover_filename)); return id; } @@ -558,7 +558,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, c QMutexLocker l(&mutex_save_image_async_); quint64 id = ++save_image_async_id_; - QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QString, song_filename), Q_ARG(QImage, image)); + QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QString, song_filename), Q_ARG(QImage, image)); return id; } @@ -567,7 +567,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, c QMutexLocker l(&mutex_save_image_async_); quint64 id = ++save_image_async_id_; - QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QString, song_filename), Q_ARG(QByteArray, image_data)); + QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QString, song_filename), Q_ARG(QByteArray, image_data)); return id; } @@ -576,7 +576,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QMutexLocker l(&mutex_save_image_async_); quint64 id = ++save_image_async_id_; - QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QList, urls), Q_ARG(QString, cover_filename)); + QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QList, urls), Q_ARG(QString, cover_filename)); return id; } @@ -585,7 +585,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QMutexLocker l(&mutex_save_image_async_); quint64 id = ++save_image_async_id_; - QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QList, urls), Q_ARG(QImage, image)); + QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QList, urls), Q_ARG(QImage, image)); return id; } @@ -594,12 +594,12 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QMutexLocker l(&mutex_save_image_async_); quint64 id = ++save_image_async_id_; - QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QList, urls), Q_ARG(QByteArray, image_data)); + QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QList, urls), Q_ARG(QByteArray, image_data)); return id; } -void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QByteArray &image_data) { +void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QByteArray &image_data) { TagReaderReply *reply = TagReaderClient::Instance()->SaveEmbeddedArt(song_filename, image_data); tagreader_save_embedded_art_requests_.insert(id, reply); @@ -608,7 +608,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_fi } -void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QImage &image) { +void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QImage &image) { QByteArray image_data; @@ -624,7 +624,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_fi } -void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QString &cover_filename) { +void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QString &cover_filename) { QFile file(cover_filename); @@ -646,7 +646,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_fi } -void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList &urls, const QImage &image) { +void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QList &urls, const QImage &image) { if (image.isNull()) { for (const QUrl &url : urls) { @@ -671,7 +671,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList &url } -void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList &urls, const QString &cover_filename) { +void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QList &urls, const QString &cover_filename) { QFile file(cover_filename); @@ -692,7 +692,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList &url } -void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList &urls, const QByteArray &image_data) { +void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QList &urls, const QByteArray &image_data) { for (const QUrl &url : urls) { SaveEmbeddedCover(id, url.toLocalFile(), image_data); @@ -700,7 +700,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList &url } -void AlbumCoverLoader::SaveEmbeddedArtFinished(const qint64 id, TagReaderReply *reply, const bool cleared) { +void AlbumCoverLoader::SaveEmbeddedArtFinished(const quint64 id, TagReaderReply *reply, const bool cleared) { if (tagreader_save_embedded_art_requests_.contains(id)) { tagreader_save_embedded_art_requests_.remove(id, reply); diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h index 2e38f1885..b80a2a38e 100644 --- a/src/covermanager/albumcoverloader.h +++ b/src/covermanager/albumcoverloader.h @@ -98,14 +98,14 @@ class AlbumCoverLoader : public QObject { void ProcessTasks(); void RemoteFetchFinished(QNetworkReply *reply, const QUrl &cover_url); - void SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QString &cover_filename); - void SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QImage &image); - void SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QByteArray &image_data); - void SaveEmbeddedCover(const qint64 id, const QList &urls, const QImage &image); - void SaveEmbeddedCover(const qint64 id, const QList &urls, const QString &cover_filename); - void SaveEmbeddedCover(const qint64 id, const QList &urls, const QByteArray &image_data); + void SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QString &cover_filename); + void SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QImage &image); + void SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QByteArray &image_data); + void SaveEmbeddedCover(const quint64 id, const QList &urls, const QImage &image); + void SaveEmbeddedCover(const quint64 id, const QList &urls, const QString &cover_filename); + void SaveEmbeddedCover(const quint64 id, const QList &urls, const QByteArray &image_data); - void SaveEmbeddedArtFinished(const qint64 id, TagReaderReply *reply, const bool cleared); + void SaveEmbeddedArtFinished(const quint64 id, TagReaderReply *reply, const bool cleared); protected: @@ -167,7 +167,7 @@ class AlbumCoverLoader : public QObject { QThread *original_thread_; - QMultiMap tagreader_save_embedded_art_requests_; + QMultiMap tagreader_save_embedded_art_requests_; };