From fa3b9a21358336ded3e3247e9388a94d75701e29 Mon Sep 17 00:00:00 2001 From: EmmanuelMess Date: Fri, 10 Sep 2021 15:17:33 -0300 Subject: [PATCH] Fix narrowing conversion in album cover loader --- .../albumcoverchoicecontroller.cpp | 10 ++++---- src/covermanager/albumcoverchoicecontroller.h | 4 ++-- src/covermanager/albumcoverloader.cpp | 24 +++++++++---------- src/covermanager/albumcoverloader.h | 12 +++++----- src/covermanager/albumcovermanager.h | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp index 2c32a5820..a8063eb3b 100644 --- a/src/covermanager/albumcoverchoicecontroller.cpp +++ b/src/covermanager/albumcoverchoicecontroller.cpp @@ -482,9 +482,9 @@ void AlbumCoverChoiceController::ShowCover(const Song &song, const QPixmap &pixm } -qint64 AlbumCoverChoiceController::SearchCoverAutomatically(const Song &song) { +quint64 AlbumCoverChoiceController::SearchCoverAutomatically(const Song &song) { - qint64 id = cover_fetcher_->FetchAlbumCover(song.effective_albumartist(), song.album(), song.title(), true); + quint64 id = cover_fetcher_->FetchAlbumCover(song.effective_albumartist(), song.album(), song.title(), true); cover_fetching_tasks_[id] = song; @@ -640,12 +640,12 @@ void AlbumCoverChoiceController::SaveCoverEmbeddedAutomatic(const Song &song, co urls.reserve(songs.count()); for (const Song &s : songs) urls << s.url(); if (result.is_jpeg()) { - qint64 id = app_->album_cover_loader()->SaveEmbeddedCoverAsync(urls, result.image_data); + quint64 id = app_->album_cover_loader()->SaveEmbeddedCoverAsync(urls, result.image_data); QMutexLocker l(&mutex_cover_save_tasks_); cover_save_tasks_.insert(id, song); } else { - qint64 id = app_->album_cover_loader()->SaveEmbeddedCoverAsync(urls, result.image); + quint64 id = app_->album_cover_loader()->SaveEmbeddedCoverAsync(urls, result.image); QMutexLocker l(&mutex_cover_save_tasks_); cover_save_tasks_.insert(id, song); } @@ -684,7 +684,7 @@ void AlbumCoverChoiceController::SaveCoverEmbeddedAutomatic(const Song &song, co QList urls; urls.reserve(songs.count()); for (const Song &s : songs) urls << s.url(); - qint64 id = app_->album_cover_loader()->SaveEmbeddedCoverAsync(urls, cover_filename); + quint64 id = app_->album_cover_loader()->SaveEmbeddedCoverAsync(urls, cover_filename); QMutexLocker l(&mutex_cover_save_tasks_); cover_save_tasks_.insert(id, song); }); diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h index f44824ead..05aa7cf01 100644 --- a/src/covermanager/albumcoverchoicecontroller.h +++ b/src/covermanager/albumcoverchoicecontroller.h @@ -129,7 +129,7 @@ class AlbumCoverChoiceController : public QWidget { void ShowCover(const Song &song, const QPixmap &pixmap); // Search for covers automatically - qint64 SearchCoverAutomatically(const Song &song); + quint64 SearchCoverAutomatically(const Song &song); // Saves the chosen cover as manual cover path of this song in collection. void SaveArtAutomaticToSong(Song *song, const QUrl &art_automatic); @@ -185,7 +185,7 @@ class AlbumCoverChoiceController : public QWidget { QAction *search_cover_auto_; QMap cover_fetching_tasks_; - QMap cover_save_tasks_; + QMap cover_save_tasks_; QMutex mutex_cover_save_tasks_; CollectionSettingsPage::SaveCoverType save_cover_type_; diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp index 271fe4701..72a89688f 100644 --- a/src/covermanager/albumcoverloader.cpp +++ b/src/covermanager/albumcoverloader.cpp @@ -545,55 +545,55 @@ void AlbumCoverLoader::RemoteFetchFinished(QNetworkReply *reply, const QUrl &cov } -qint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, const QString &cover_filename) { +quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, const QString &cover_filename) { QMutexLocker l(&mutex_save_image_async_); - qint64 id = ++save_image_async_id_; + 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)); return id; } -qint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, const QImage &image) { +quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, const QImage &image) { QMutexLocker l(&mutex_save_image_async_); - qint64 id = ++save_image_async_id_; + 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)); return id; } -qint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, const QByteArray &image_data) { +quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, const QByteArray &image_data) { QMutexLocker l(&mutex_save_image_async_); - qint64 id = ++save_image_async_id_; + 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)); return id; } -qint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QString &cover_filename) { +quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QString &cover_filename) { QMutexLocker l(&mutex_save_image_async_); - qint64 id = ++save_image_async_id_; + 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)); return id; } -qint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QImage &image) { +quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QImage &image) { QMutexLocker l(&mutex_save_image_async_); - qint64 id = ++save_image_async_id_; + quint64 id = ++save_image_async_id_; QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QList, urls), Q_ARG(QImage, image)); return id; } -qint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QByteArray &image_data) { +quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList &urls, const QByteArray &image_data) { QMutexLocker l(&mutex_save_image_async_); - qint64 id = ++save_image_async_id_; + 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)); return id; diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h index c175938ba..2e38f1885 100644 --- a/src/covermanager/albumcoverloader.h +++ b/src/covermanager/albumcoverloader.h @@ -81,12 +81,12 @@ class AlbumCoverLoader : public QObject { void CancelTask(const quint64 id); void CancelTasks(const QSet &ids); - qint64 SaveEmbeddedCoverAsync(const QString &song_filename, const QString &cover_filename); - qint64 SaveEmbeddedCoverAsync(const QString &song_filename, const QImage &image); - qint64 SaveEmbeddedCoverAsync(const QString &song_filename, const QByteArray &image_data); - qint64 SaveEmbeddedCoverAsync(const QList &urls, const QString &cover_filename); - qint64 SaveEmbeddedCoverAsync(const QList &urls, const QImage &image); - qint64 SaveEmbeddedCoverAsync(const QList &urls, const QByteArray &image_data); + quint64 SaveEmbeddedCoverAsync(const QString &song_filename, const QString &cover_filename); + quint64 SaveEmbeddedCoverAsync(const QString &song_filename, const QImage &image); + quint64 SaveEmbeddedCoverAsync(const QString &song_filename, const QByteArray &image_data); + quint64 SaveEmbeddedCoverAsync(const QList &urls, const QString &cover_filename); + quint64 SaveEmbeddedCoverAsync(const QList &urls, const QImage &image); + quint64 SaveEmbeddedCoverAsync(const QList &urls, const QByteArray &image_data); signals: void ExitFinished(); diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h index fff569b82..c3cfe575b 100644 --- a/src/covermanager/albumcovermanager.h +++ b/src/covermanager/albumcovermanager.h @@ -214,7 +214,7 @@ class AlbumCoverManager : public QMainWindow { QPushButton *abort_progress_; int jobs_; - QMultiMap cover_save_tasks_; + QMultiMap cover_save_tasks_; QList cover_save_tasks2_; QListWidgetItem *all_artists_;