diff --git a/ext/libstrawberry-tagreader/tagreaderbase.cpp b/ext/libstrawberry-tagreader/tagreaderbase.cpp index dcbd44b1..18c07c89 100644 --- a/ext/libstrawberry-tagreader/tagreaderbase.cpp +++ b/ext/libstrawberry-tagreader/tagreaderbase.cpp @@ -63,18 +63,18 @@ TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::S return Cover(); } - const QString song_filename = QString::fromUtf8(request.filename().data(), request.filename().size()); + const QString song_filename = QString::fromUtf8(request.filename().data(), static_cast(request.filename().size())); QString cover_filename; if (request.has_cover_filename()) { - cover_filename = QString::fromUtf8(request.cover_filename().data(), request.cover_filename().size()); + cover_filename = QString::fromUtf8(request.cover_filename().data(), static_cast(request.cover_filename().size())); } QByteArray cover_data; if (request.has_cover_data()) { - cover_data = QByteArray(request.cover_data().data(), request.cover_data().size()); + cover_data = QByteArray(request.cover_data().data(), static_cast(request.cover_data().size())); } QString cover_mime_type; if (request.has_cover_mime_type()) { - cover_mime_type = QByteArray(request.cover_mime_type().data(), request.cover_mime_type().size()); + cover_mime_type = QByteArray(request.cover_mime_type().data(), static_cast(request.cover_mime_type().size())); } return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type); @@ -83,18 +83,18 @@ TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::S TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::SaveEmbeddedArtRequest &request) { - const QString song_filename = QString::fromUtf8(request.filename().data(), request.filename().size()); + const QString song_filename = QString::fromUtf8(request.filename().data(), static_cast(request.filename().size())); QString cover_filename; if (request.has_cover_filename()) { - cover_filename = QString::fromUtf8(request.cover_filename().data(), request.cover_filename().size()); + cover_filename = QString::fromUtf8(request.cover_filename().data(), static_cast(request.cover_filename().size())); } QByteArray cover_data; if (request.has_cover_data()) { - cover_data = QByteArray(request.cover_data().data(), request.cover_data().size()); + cover_data = QByteArray(request.cover_data().data(), static_cast(request.cover_data().size())); } QString cover_mime_type; if (request.has_cover_mime_type()) { - cover_mime_type = QByteArray(request.cover_mime_type().data(), request.cover_mime_type().size()); + cover_mime_type = QByteArray(request.cover_mime_type().data(), static_cast(request.cover_mime_type().size())); } return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type); diff --git a/ext/libstrawberry-tagreader/tagreadertaglib.cpp b/ext/libstrawberry-tagreader/tagreadertaglib.cpp index 4647e1fe..dce41d7e 100644 --- a/ext/libstrawberry-tagreader/tagreadertaglib.cpp +++ b/ext/libstrawberry-tagreader/tagreadertaglib.cpp @@ -665,8 +665,8 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta if (compilation.isEmpty()) { // well, it wasn't set, but if the artist is VA assume it's a compilation - const QString albumartist = QString::fromUtf8(song->albumartist().data(), song->albumartist().size()); - const QString artist = QString::fromUtf8(song->artist().data(), song->artist().size()); + const QString albumartist = QString::fromUtf8(song->albumartist().data(), static_cast(song->albumartist().size())); + const QString artist = QString::fromUtf8(song->artist().data(), static_cast(song->artist().size())); if (artist.compare("various artists") == 0 || albumartist.compare("various artists") == 0) { song->set_compilation(true); } @@ -830,7 +830,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c if (request.filename().empty()) return false; - const QString filename = QString::fromUtf8(request.filename().data(), request.filename().size()); + const QString filename = QString::fromUtf8(request.filename().data(), static_cast(request.filename().size())); const spb::tagreader::SongMetadata song = request.metadata(); const bool save_tags = request.has_save_tags() && request.save_tags(); const bool save_playcount = request.has_save_playcount() && request.save_playcount(); @@ -1320,7 +1320,7 @@ bool TagReaderTagLib::SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtReque if (request.filename().empty()) return false; - const QString filename = QString::fromUtf8(request.filename().data(), request.filename().size()); + const QString filename = QString::fromUtf8(request.filename().data(), static_cast(request.filename().size())); qLog(Debug) << "Saving art to" << filename; diff --git a/ext/strawberry-tagreader/tagreaderworker.cpp b/ext/strawberry-tagreader/tagreaderworker.cpp index 1af2722e..e1df2353 100644 --- a/ext/strawberry-tagreader/tagreaderworker.cpp +++ b/ext/strawberry-tagreader/tagreaderworker.cpp @@ -56,13 +56,13 @@ void TagReaderWorker::DeviceClosed() { bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply, TagReaderBase *reader) { if (message.has_is_media_file_request()) { - const QString filename = QString::fromUtf8(message.is_media_file_request().filename().data(), message.is_media_file_request().filename().size()); + const QString filename = QString::fromUtf8(message.is_media_file_request().filename().data(), static_cast(message.is_media_file_request().filename().size())); bool success = reader->IsMediaFile(filename); reply.mutable_is_media_file_response()->set_success(success); return success; } else if (message.has_read_file_request()) { - const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), message.read_file_request().filename().size()); + const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), static_cast(static_cast(message.read_file_request().filename().size()))); bool success = reader->ReadFile(filename, reply.mutable_read_file_response()->mutable_metadata()); return success; } @@ -72,7 +72,7 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb: return success; } else if (message.has_load_embedded_art_request()) { - const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), message.load_embedded_art_request().filename().size()); + const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), static_cast(static_cast(message.load_embedded_art_request().filename().size()))); QByteArray data = reader->LoadEmbeddedArt(filename); reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size()); return true; @@ -83,13 +83,13 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb: return success; } else if (message.has_save_song_playcount_to_file_request()) { - const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), message.save_song_playcount_to_file_request().filename().size()); + const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), static_cast(static_cast(message.save_song_playcount_to_file_request().filename().size()))); bool success = reader->SaveSongPlaycountToFile(filename, message.save_song_playcount_to_file_request().metadata()); reply.mutable_save_song_playcount_to_file_response()->set_success(success); return success; } else if (message.has_save_song_rating_to_file_request()) { - const QString filename = QString::fromUtf8(message.save_song_rating_to_file_request().filename().data(), message.save_song_rating_to_file_request().filename().size()); + const QString filename = QString::fromUtf8(message.save_song_rating_to_file_request().filename().data(), static_cast(message.save_song_rating_to_file_request().filename().size())); bool success = reader->SaveSongRatingToFile(filename, message.save_song_rating_to_file_request().metadata()); reply.mutable_save_song_rating_to_file_response()->set_success(success); return success; diff --git a/src/context/contextalbum.cpp b/src/context/contextalbum.cpp index c4ed2adb..95d6e363 100644 --- a/src/context/contextalbum.cpp +++ b/src/context/contextalbum.cpp @@ -89,7 +89,7 @@ void ContextAlbum::Init(ContextView *context_view, AlbumCoverChoiceController *a QSize ContextAlbum::sizeHint() const { - return QSize(pixmap_current_.width() / devicePixelRatioF(), pixmap_current_.height() / devicePixelRatioF()); + return QSize(static_cast(pixmap_current_.width() / devicePixelRatioF()), static_cast(pixmap_current_.height() / devicePixelRatioF())); } @@ -180,7 +180,7 @@ void ContextAlbum::DrawImage(QPainter *p, const QPixmap &pixmap, const qreal opa if (qFuzzyCompare(opacity, static_cast(0.0))) return; p->setOpacity(opacity); - p->drawPixmap(0, 0, pixmap.width() / pixmap.devicePixelRatioF(), pixmap.height() / pixmap.devicePixelRatioF(), pixmap); + p->drawPixmap(0, 0, static_cast(pixmap.width() / pixmap.devicePixelRatioF()), static_cast(pixmap.height() / pixmap.devicePixelRatioF()), pixmap); } diff --git a/src/core/song.cpp b/src/core/song.cpp index 2c99122a..b63c3dbe 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -1156,27 +1156,27 @@ void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) { d->init_from_file_ = true; d->valid_ = pb.valid(); - set_title(QString::fromUtf8(pb.title().data(), pb.title().size())); - set_album(QString::fromUtf8(pb.album().data(), pb.album().size())); - set_artist(QString::fromUtf8(pb.artist().data(), pb.artist().size())); - set_albumartist(QString::fromUtf8(pb.albumartist().data(), pb.albumartist().size())); + set_title(QString::fromUtf8(pb.title().data(), static_cast(pb.title().size()))); + set_album(QString::fromUtf8(pb.album().data(), static_cast(pb.album().size()))); + set_artist(QString::fromUtf8(pb.artist().data(), static_cast(pb.artist().size()))); + set_albumartist(QString::fromUtf8(pb.albumartist().data(), static_cast(pb.albumartist().size()))); d->track_ = pb.track(); d->disc_ = pb.disc(); d->year_ = pb.year(); d->originalyear_ = pb.originalyear(); - d->genre_ = QString::fromUtf8(pb.genre().data(), pb.genre().size()); + d->genre_ = QString::fromUtf8(pb.genre().data(), static_cast(pb.genre().size())); d->compilation_ = pb.compilation(); - d->composer_ = QString::fromUtf8(pb.composer().data(), pb.composer().size()); - d->performer_ = QString::fromUtf8(pb.performer().data(), pb.performer().size()); - d->grouping_ = QString::fromUtf8(pb.grouping().data(), pb.grouping().size()); - d->comment_ = QString::fromUtf8(pb.comment().data(), pb.comment().size()); - d->lyrics_ = QString::fromUtf8(pb.lyrics().data(), pb.lyrics().size()); + d->composer_ = QString::fromUtf8(pb.composer().data(), static_cast(pb.composer().size())); + d->performer_ = QString::fromUtf8(pb.performer().data(), static_cast(pb.performer().size())); + d->grouping_ = QString::fromUtf8(pb.grouping().data(), static_cast(pb.grouping().size())); + d->comment_ = QString::fromUtf8(pb.comment().data(), static_cast(pb.comment().size())); + d->lyrics_ = QString::fromUtf8(pb.lyrics().data(), static_cast(pb.lyrics().size())); set_length_nanosec(static_cast(pb.length_nanosec())); d->bitrate_ = pb.bitrate(); d->samplerate_ = pb.samplerate(); d->bitdepth_ = pb.bitdepth(); set_url(QUrl::fromEncoded(QByteArray(pb.url().data(), static_cast(pb.url().size())))); - d->basefilename_ = QString::fromUtf8(pb.basefilename().data(), pb.basefilename().size()); + d->basefilename_ = QString::fromUtf8(pb.basefilename().data(), static_cast(pb.basefilename().size())); d->filetype_ = static_cast(pb.filetype()); d->filesize_ = pb.filesize(); d->mtime_ = pb.mtime(); @@ -1194,19 +1194,19 @@ void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) { d->art_embedded_ = pb.has_art_embedded(); - d->acoustid_id_ = QString::fromUtf8(pb.acoustid_id().data(), pb.acoustid_id().size()); - d->acoustid_fingerprint_ = QString::fromUtf8(pb.acoustid_fingerprint().data(), pb.acoustid_fingerprint().size()); + d->acoustid_id_ = QString::fromUtf8(pb.acoustid_id().data(), static_cast(pb.acoustid_id().size())); + d->acoustid_fingerprint_ = QString::fromUtf8(pb.acoustid_fingerprint().data(), static_cast(pb.acoustid_fingerprint().size())); - d->musicbrainz_album_artist_id_ = QString::fromUtf8(pb.musicbrainz_album_artist_id().data(), pb.musicbrainz_album_artist_id().size()); - d->musicbrainz_artist_id_ = QString::fromUtf8(pb.musicbrainz_artist_id().data(), pb.musicbrainz_artist_id().size()); - d->musicbrainz_original_artist_id_ = QString::fromUtf8(pb.musicbrainz_original_artist_id().data(), pb.musicbrainz_original_artist_id().size()); - d->musicbrainz_album_id_ = QString::fromUtf8(pb.musicbrainz_album_id().data(), pb.musicbrainz_album_id().size()); - d->musicbrainz_original_album_id_ = QString::fromUtf8(pb.musicbrainz_original_album_id().data(), pb.musicbrainz_original_album_id().size()); - d->musicbrainz_recording_id_ = QString::fromUtf8(pb.musicbrainz_recording_id().data(), pb.musicbrainz_recording_id().size()); - d->musicbrainz_track_id_ = QString::fromUtf8(pb.musicbrainz_track_id().data(), pb.musicbrainz_track_id().size()); - d->musicbrainz_disc_id_ = QString::fromUtf8(pb.musicbrainz_disc_id().data(), pb.musicbrainz_disc_id().size()); - d->musicbrainz_release_group_id_ = QString::fromUtf8(pb.musicbrainz_release_group_id().data(), pb.musicbrainz_release_group_id().size()); - d->musicbrainz_work_id_ = QString::fromUtf8(pb.musicbrainz_work_id().data(), pb.musicbrainz_work_id().size()); + d->musicbrainz_album_artist_id_ = QString::fromUtf8(pb.musicbrainz_album_artist_id().data(), static_cast(pb.musicbrainz_album_artist_id().size())); + d->musicbrainz_artist_id_ = QString::fromUtf8(pb.musicbrainz_artist_id().data(), static_cast(pb.musicbrainz_artist_id().size())); + d->musicbrainz_original_artist_id_ = QString::fromUtf8(pb.musicbrainz_original_artist_id().data(), static_cast(pb.musicbrainz_original_artist_id().size())); + d->musicbrainz_album_id_ = QString::fromUtf8(pb.musicbrainz_album_id().data(), static_cast(pb.musicbrainz_album_id().size())); + d->musicbrainz_original_album_id_ = QString::fromUtf8(pb.musicbrainz_original_album_id().data(), static_cast(pb.musicbrainz_original_album_id().size())); + d->musicbrainz_recording_id_ = QString::fromUtf8(pb.musicbrainz_recording_id().data(), static_cast(pb.musicbrainz_recording_id().size())); + d->musicbrainz_track_id_ = QString::fromUtf8(pb.musicbrainz_track_id().data(), static_cast(pb.musicbrainz_track_id().size())); + d->musicbrainz_disc_id_ = QString::fromUtf8(pb.musicbrainz_disc_id().data(), static_cast(pb.musicbrainz_disc_id().size())); + d->musicbrainz_release_group_id_ = QString::fromUtf8(pb.musicbrainz_release_group_id().data(), static_cast(pb.musicbrainz_release_group_id().size())); + d->musicbrainz_work_id_ = QString::fromUtf8(pb.musicbrainz_work_id().data(), static_cast(pb.musicbrainz_work_id().size())); d->suspicious_tags_ = pb.suspicious_tags(); diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp index a1546ee7..cdf137c9 100644 --- a/src/covermanager/albumcoverchoicecontroller.cpp +++ b/src/covermanager/albumcoverchoicecontroller.cpp @@ -491,13 +491,13 @@ void AlbumCoverChoiceController::ShowCover(const Song &song, const QPixmap &pixm if (desktop_width < desktop_height) { const int new_width = static_cast(static_cast(desktop_width) * 0.95); if (new_width < pixmap.width()) { - label->setPixmap(pixmap.scaledToWidth(new_width * pixmap.devicePixelRatioF(), Qt::SmoothTransformation)); + label->setPixmap(pixmap.scaledToWidth(static_cast(new_width * pixmap.devicePixelRatioF()), Qt::SmoothTransformation)); } } else { const int new_height = static_cast(static_cast(desktop_height) * 0.85); if (new_height < pixmap.height()) { - label->setPixmap(pixmap.scaledToHeight(new_height * pixmap.devicePixelRatioF(), Qt::SmoothTransformation)); + label->setPixmap(pixmap.scaledToHeight(static_cast(new_height * pixmap.devicePixelRatioF()), Qt::SmoothTransformation)); } } diff --git a/src/osd/osdpretty.cpp b/src/osd/osdpretty.cpp index 1bb6cb7e..ffc1cf81 100644 --- a/src/osd/osdpretty.cpp +++ b/src/osd/osdpretty.cpp @@ -343,7 +343,7 @@ void OSDPretty::paintEvent(QPaintEvent*) { void OSDPretty::SetMessage(const QString &summary, const QString &message, const QImage &image) { if (!image.isNull()) { - QImage scaled_image = image.scaled(kMaxIconSize * devicePixelRatioF(), kMaxIconSize * devicePixelRatioF(), Qt::KeepAspectRatio, Qt::SmoothTransformation); + QImage scaled_image = image.scaled(static_cast(kMaxIconSize * devicePixelRatioF()), static_cast(kMaxIconSize * devicePixelRatioF()), Qt::KeepAspectRatio, Qt::SmoothTransformation); scaled_image.setDevicePixelRatio(devicePixelRatioF()); ui_->icon->setPixmap(QPixmap::fromImage(scaled_image)); ui_->icon->show(); diff --git a/src/utilities/imageutils.cpp b/src/utilities/imageutils.cpp index 8c555a6b..d837b01d 100644 --- a/src/utilities/imageutils.cpp +++ b/src/utilities/imageutils.cpp @@ -98,7 +98,7 @@ QImage ImageUtils::ScaleImage(const QImage &image, const QSize desired_size, con return image; } - QSize scale_size(desired_size.width() * device_pixel_ratio, desired_size.height() * device_pixel_ratio); + QSize scale_size(static_cast(desired_size.width() * device_pixel_ratio), static_cast(desired_size.height() * device_pixel_ratio)); // Scale the image QImage image_scaled = image.scaled(scale_size, Qt::KeepAspectRatio, Qt::SmoothTransformation); @@ -124,7 +124,7 @@ QImage ImageUtils::ScaleImage(const QImage &image, const QSize desired_size, con QImage ImageUtils::GenerateNoCoverImage(const QSize size, const qreal device_pixel_ratio) { QImage image(":/pictures/cdcase.png"); - QSize scale_size(size.width() * device_pixel_ratio, size.height() * device_pixel_ratio); + QSize scale_size(static_cast(size.width() * device_pixel_ratio), static_cast(size.height() * device_pixel_ratio)); // Get a square version of the nocover image with some transparency: QImage image_scaled = image.scaled(scale_size, Qt::KeepAspectRatio, Qt::SmoothTransformation); diff --git a/src/widgets/playingwidget.cpp b/src/widgets/playingwidget.cpp index 68e9def9..689fbc7a 100644 --- a/src/widgets/playingwidget.cpp +++ b/src/widgets/playingwidget.cpp @@ -305,12 +305,12 @@ void PlayingWidget::SetImage(const QImage &image) { if (enabled_ && visible_ && active_) { // Cache the current pixmap so we can fade between them QSize psize; - psize.setWidth(size().width() * devicePixelRatioF()); + psize.setWidth(static_cast(size().width() * devicePixelRatioF())); if (size().height() > 0) { - psize.setHeight(size().height() * devicePixelRatioF()); + psize.setHeight(static_cast(size().height() * devicePixelRatioF())); } else { - psize.setHeight(total_height_ * devicePixelRatioF()); + psize.setHeight(static_cast(total_height_ * devicePixelRatioF())); } pixmap_previous_track_ = QPixmap(psize); pixmap_previous_track_.setDevicePixelRatio(devicePixelRatioF());