Skip to content

Qt6: Add missing explicit conversions to QUuid #4453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Holzhaus merged 1 commit into from
Oct 17, 2021
Merged

Qt6: Add missing explicit conversions to QUuid #4453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/track/taglib/trackmetadata_mp4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,19 +221,19 @@ void importTrackMetadataFromTag(

QString trackArtistId;
if (readAtom(tag, "----:com.apple.iTunes:MusicBrainz Artist Id", &trackArtistId)) {
pTrackMetadata->refTrackInfo().setMusicBrainzArtistId(trackArtistId);
pTrackMetadata->refTrackInfo().setMusicBrainzArtistId(QUuid(trackArtistId));
}
QString trackRecordingId;
if (readAtom(tag, "----:com.apple.iTunes:MusicBrainz Track Id", &trackRecordingId)) {
pTrackMetadata->refTrackInfo().setMusicBrainzRecordingId(trackRecordingId);
pTrackMetadata->refTrackInfo().setMusicBrainzRecordingId(QUuid(trackRecordingId));
}
QString trackReleaseId;
if (readAtom(tag, "----:com.apple.iTunes:MusicBrainz Release Track Id", &trackReleaseId)) {
pTrackMetadata->refTrackInfo().setMusicBrainzReleaseId(trackReleaseId);
pTrackMetadata->refTrackInfo().setMusicBrainzReleaseId(QUuid(trackReleaseId));
}
QString trackWorkId;
if (readAtom(tag, "----:com.apple.iTunes:MusicBrainz Work Id", &trackWorkId)) {
pTrackMetadata->refTrackInfo().setMusicBrainzWorkId(trackWorkId);
pTrackMetadata->refTrackInfo().setMusicBrainzWorkId(QUuid(trackWorkId));
}
QString albumArtistId;
if (readAtom(tag, "----:com.apple.iTunes:MusicBrainz Album Artist Id", &albumArtistId)) {
Expand Down
8 changes: 4 additions & 4 deletions src/track/taglib/trackmetadata_xiph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,19 +382,19 @@ void importTrackMetadataFromTag(

QString trackArtistId;
if (readCommentField(tag, "MUSICBRAINZ_ARTISTID", &trackArtistId)) {
pTrackMetadata->refTrackInfo().setMusicBrainzArtistId(trackArtistId);
pTrackMetadata->refTrackInfo().setMusicBrainzArtistId(QUuid(trackArtistId));
}
QString trackRecordingId;
if (readCommentField(tag, "MUSICBRAINZ_TRACKID", &trackRecordingId)) {
pTrackMetadata->refTrackInfo().setMusicBrainzRecordingId(trackRecordingId);
pTrackMetadata->refTrackInfo().setMusicBrainzRecordingId(QUuid(trackRecordingId));
}
QString trackReleaseId;
if (readCommentField(tag, "MUSICBRAINZ_RELEASETRACKID", &trackReleaseId)) {
pTrackMetadata->refTrackInfo().setMusicBrainzReleaseId(trackReleaseId);
pTrackMetadata->refTrackInfo().setMusicBrainzReleaseId(QUuid(trackReleaseId));
}
QString trackWorkId;
if (readCommentField(tag, "MUSICBRAINZ_WORKID", &trackWorkId)) {
pTrackMetadata->refTrackInfo().setMusicBrainzWorkId(trackWorkId);
pTrackMetadata->refTrackInfo().setMusicBrainzWorkId(QUuid(trackWorkId));
}
QString albumArtistId;
if (readCommentField(tag, "MUSICBRAINZ_ALBUMARTISTID", &albumArtistId)) {
Expand Down