From 983a35f5ae76d83abd6b89ffb9fa9b5c59f2e8a5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 26 Nov 2022 22:02:47 -0800 Subject: [PATCH] clang-tidy: avoid C casting Found with google-readability-casting Signed-off-by: Rosen Penev --- taglib/ape/apeitem.cpp | 2 +- taglib/asf/asfattribute.cpp | 4 ++-- taglib/flac/flacpicture.cpp | 2 +- taglib/mp4/mp4tag.cpp | 6 +++--- taglib/mpeg/id3v1/id3v1tag.cpp | 6 +++--- taglib/mpeg/id3v2/frames/attachedpictureframe.cpp | 8 ++++---- taglib/mpeg/id3v2/frames/chapterframe.cpp | 2 +- taglib/mpeg/id3v2/frames/commentsframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp | 6 +++--- .../id3v2/frames/generalencapsulatedobjectframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/ownershipframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/popularimeterframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/relativevolumeframe.cpp | 10 +++++----- taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp | 12 ++++++------ taglib/mpeg/id3v2/frames/textidentificationframe.cpp | 4 ++-- .../mpeg/id3v2/frames/uniquefileidentifierframe.cpp | 2 +- .../mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/urllinkframe.cpp | 4 ++-- taglib/mpeg/id3v2/id3v2frame.cpp | 2 +- taglib/mpeg/id3v2/id3v2framefactory.cpp | 4 ++-- taglib/mpeg/id3v2/id3v2header.cpp | 6 +++--- taglib/ogg/oggpage.cpp | 8 ++++---- taglib/ogg/oggpageheader.cpp | 6 +++--- taglib/ogg/xiphcomment.cpp | 2 +- taglib/toolkit/tbytevectorlist.cpp | 2 +- taglib/toolkit/tbytevectorstream.cpp | 4 ++-- taglib/toolkit/tfile.cpp | 6 +++--- 27 files changed, 64 insertions(+), 64 deletions(-) diff --git a/taglib/ape/apeitem.cpp b/taglib/ape/apeitem.cpp index bbf463ab..341da34b 100644 --- a/taglib/ape/apeitem.cpp +++ b/taglib/ape/apeitem.cpp @@ -257,7 +257,7 @@ void APE::Item::parse(const ByteVector &data) const ByteVector value = data.mid(8 + d->key.size() + 1, valueLength); setReadOnly(flags & 1); - setType(ItemTypes((flags >> 1) & 3)); + setType(static_cast((flags >> 1) & 3)); if(Text == d->type) d->text = StringList(ByteVectorList::split(value, '\0'), String::UTF8); diff --git a/taglib/asf/asfattribute.cpp b/taglib/asf/asfattribute.cpp index 1aa8e6f2..6b4a12f4 100644 --- a/taglib/asf/asfattribute.cpp +++ b/taglib/asf/asfattribute.cpp @@ -185,7 +185,7 @@ String ASF::Attribute::parse(ASF::File &f, int kind) if(kind == 0) { nameLength = readWORD(&f); name = readString(&f, nameLength); - d->type = ASF::Attribute::AttributeTypes(readWORD(&f)); + d->type = static_cast(readWORD(&f)); size = readWORD(&f); } // metadata & metadata library @@ -197,7 +197,7 @@ String ASF::Attribute::parse(ASF::File &f, int kind) } d->stream = readWORD(&f); nameLength = readWORD(&f); - d->type = ASF::Attribute::AttributeTypes(readWORD(&f)); + d->type = static_cast(readWORD(&f)); size = readDWORD(&f); name = readString(&f, nameLength); } diff --git a/taglib/flac/flacpicture.cpp b/taglib/flac/flacpicture.cpp index ec07ad14..6005bbb7 100644 --- a/taglib/flac/flacpicture.cpp +++ b/taglib/flac/flacpicture.cpp @@ -79,7 +79,7 @@ bool FLAC::Picture::parse(const ByteVector &data) } unsigned int pos = 0; - d->type = FLAC::Picture::Type(data.toUInt(pos)); + d->type = static_cast(data.toUInt(pos)); pos += 4; unsigned int mimeTypeLength = data.toUInt(pos); pos += 4; diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp index 758475b9..946c789d 100644 --- a/taglib/mp4/mp4tag.cpp +++ b/taglib/mp4/mp4tag.cpp @@ -144,7 +144,7 @@ MP4::Tag::parseData2(const MP4::Atom *atom, int expectedFlags, bool freeForm) debug("MP4: Unexpected atom \"" + name + "\", expecting \"name\""); return result; } - result.append(AtomData(AtomDataType(flags), data.mid(pos + 12, length - 12))); + result.append(AtomData(static_cast(flags), data.mid(pos + 12, length - 12))); } else { if(name != "data") { @@ -152,7 +152,7 @@ MP4::Tag::parseData2(const MP4::Atom *atom, int expectedFlags, bool freeForm) return result; } if(expectedFlags == -1 || flags == expectedFlags) { - result.append(AtomData(AtomDataType(flags), data.mid(pos + 16, length - 16))); + result.append(AtomData(static_cast(flags), data.mid(pos + 16, length - 16))); } } pos += length; @@ -316,7 +316,7 @@ MP4::Tag::parseCovr(const MP4::Atom *atom) } if(flags == TypeJPEG || flags == TypePNG || flags == TypeBMP || flags == TypeGIF || flags == TypeImplicit) { - value.append(MP4::CoverArt(MP4::CoverArt::Format(flags), + value.append(MP4::CoverArt(static_cast(flags), data.mid(pos + 16, length - 16))); } else { diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp index 9c91e3cc..667adfa6 100644 --- a/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/taglib/mpeg/id3v1/id3v1tag.cpp @@ -112,9 +112,9 @@ ByteVector ID3v1::Tag::render() const data.append(stringHandler->render(d->album).resize(30)); data.append(stringHandler->render(d->year).resize(4)); data.append(stringHandler->render(d->comment).resize(28)); - data.append(char(0)); - data.append(char(d->track)); - data.append(char(d->genre)); + data.append(static_cast(0)); + data.append(static_cast(d->track)); + data.append(static_cast(d->genre)); return data; } diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp index 914a8f75..cd0297cb 100644 --- a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp +++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp @@ -133,7 +133,7 @@ void AttachedPictureFrame::parseFields(const ByteVector &data) return; } - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); int pos = 1; @@ -156,10 +156,10 @@ ByteVector AttachedPictureFrame::renderFields() const String::Type encoding = checkTextEncoding(d->description, d->textEncoding); - data.append(char(encoding)); + data.append(static_cast(encoding)); data.append(d->mimeType.data(String::Latin1)); data.append(textDelimiter(String::Latin1)); - data.append(char(d->type)); + data.append(static_cast(d->type)); data.append(d->description.data(encoding)); data.append(textDelimiter(encoding)); data.append(d->data); @@ -189,7 +189,7 @@ void AttachedPictureFrameV22::parseFields(const ByteVector &data) return; } - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); int pos = 1; diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp index c839f588..540c87b5 100644 --- a/taglib/mpeg/id3v2/frames/chapterframe.cpp +++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp @@ -124,7 +124,7 @@ void ChapterFrame::setElementID(const ByteVector &eID) { d->elementID = eID; - if(d->elementID.endsWith(char(0))) + if(d->elementID.endsWith(static_cast(0))) d->elementID = d->elementID.mid(0, d->elementID.size() - 1); } diff --git a/taglib/mpeg/id3v2/frames/commentsframe.cpp b/taglib/mpeg/id3v2/frames/commentsframe.cpp index 815e5e1a..add0bf2f 100644 --- a/taglib/mpeg/id3v2/frames/commentsframe.cpp +++ b/taglib/mpeg/id3v2/frames/commentsframe.cpp @@ -150,7 +150,7 @@ void CommentsFrame::parseFields(const ByteVector &data) return; } - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); d->language = data.mid(1, 3); int byteAlign = d->textEncoding == String::Latin1 || d->textEncoding == String::UTF8 ? 1 : 2; @@ -177,7 +177,7 @@ ByteVector CommentsFrame::renderFields() const encoding = checkTextEncoding(d->description, encoding); encoding = checkTextEncoding(d->text, encoding); - v.append(char(encoding)); + v.append(static_cast(encoding)); v.append(d->language.size() == 3 ? d->language : "XXX"); v.append(d->description.data(encoding)); v.append(textDelimiter(encoding)); diff --git a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp index 93031812..4d1a5d8c 100644 --- a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp +++ b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp @@ -104,7 +104,7 @@ void EventTimingCodesFrame::parseFields(const ByteVector &data) return; } - d->timestampFormat = TimestampFormat(data[0]); + d->timestampFormat = static_cast(data[0]); int pos = 1; d->synchedEvents.clear(); @@ -120,12 +120,12 @@ ByteVector EventTimingCodesFrame::renderFields() const { ByteVector v; - v.append(char(d->timestampFormat)); + v.append(static_cast(d->timestampFormat)); for(SynchedEventList::ConstIterator it = d->synchedEvents.begin(); it != d->synchedEvents.end(); ++it) { const SynchedEvent &entry = *it; - v.append(char(entry.type)); + v.append(static_cast(entry.type)); v.append(ByteVector::fromUInt(entry.time)); } diff --git a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp index c9b2f6dc..219b275a 100644 --- a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp +++ b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp @@ -142,7 +142,7 @@ void GeneralEncapsulatedObjectFrame::parseFields(const ByteVector &data) return; } - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); int pos = 1; @@ -163,7 +163,7 @@ ByteVector GeneralEncapsulatedObjectFrame::renderFields() const ByteVector data; - data.append(char(encoding)); + data.append(static_cast(encoding)); data.append(d->mimeType.data(String::Latin1)); data.append(textDelimiter(String::Latin1)); data.append(d->fileName.data(encoding)); diff --git a/taglib/mpeg/id3v2/frames/ownershipframe.cpp b/taglib/mpeg/id3v2/frames/ownershipframe.cpp index 132f5f27..e318d74d 100644 --- a/taglib/mpeg/id3v2/frames/ownershipframe.cpp +++ b/taglib/mpeg/id3v2/frames/ownershipframe.cpp @@ -123,7 +123,7 @@ void OwnershipFrame::parseFields(const ByteVector &data) } // Get the text encoding - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); pos += 1; // Read the price paid this is a null terminate string @@ -155,7 +155,7 @@ ByteVector OwnershipFrame::renderFields() const ByteVector v; - v.append(char(encoding)); + v.append(static_cast(encoding)); v.append(d->pricePaid.data(String::Latin1)); v.append(textDelimiter(String::Latin1)); v.append(d->datePurchased.data(String::Latin1)); diff --git a/taglib/mpeg/id3v2/frames/popularimeterframe.cpp b/taglib/mpeg/id3v2/frames/popularimeterframe.cpp index b33067de..c819c8c2 100644 --- a/taglib/mpeg/id3v2/frames/popularimeterframe.cpp +++ b/taglib/mpeg/id3v2/frames/popularimeterframe.cpp @@ -102,7 +102,7 @@ void PopularimeterFrame::setCounter(unsigned int s) void PopularimeterFrame::parseFields(const ByteVector &data) { - int pos = 0, size = int(data.size()); + int pos = 0, size = static_cast(data.size()); d->email = readStringField(data, String::Latin1, &pos); @@ -122,7 +122,7 @@ ByteVector PopularimeterFrame::renderFields() const data.append(d->email.data(String::Latin1)); data.append(textDelimiter(String::Latin1)); - data.append(char(d->rating)); + data.append(static_cast(d->rating)); data.append(ByteVector::fromUInt(d->counter)); return data; diff --git a/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp index c0817cb9..d9ad177f 100644 --- a/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp +++ b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp @@ -121,7 +121,7 @@ void RelativeVolumeFrame::setVolumeAdjustmentIndex(short index) float RelativeVolumeFrame::volumeAdjustment(ChannelType type) const { - return d->channels.contains(type) ? float(d->channels[type].volumeAdjustment) / float(512) : 0; + return d->channels.contains(type) ? static_cast(d->channels[type].volumeAdjustment) / static_cast(512) : 0; } float RelativeVolumeFrame::volumeAdjustment() const @@ -131,7 +131,7 @@ float RelativeVolumeFrame::volumeAdjustment() const void RelativeVolumeFrame::setVolumeAdjustment(float adjustment, ChannelType type) { - d->channels[type].volumeAdjustment = short(adjustment * float(512)); + d->channels[type].volumeAdjustment = static_cast(adjustment * static_cast(512)); } void RelativeVolumeFrame::setVolumeAdjustment(float adjustment) @@ -182,7 +182,7 @@ void RelativeVolumeFrame::parseFields(const ByteVector &data) while(pos <= static_cast(data.size()) - 4) { - ChannelType type = ChannelType(data[pos]); + ChannelType type = static_cast(data[pos]); pos += 1; ChannelData &channel = d->channels[type]; @@ -212,9 +212,9 @@ ByteVector RelativeVolumeFrame::renderFields() const ChannelType type = (*it).first; const ChannelData &channel = (*it).second; - data.append(char(type)); + data.append(static_cast(type)); data.append(ByteVector::fromShort(channel.volumeAdjustment)); - data.append(char(channel.peakVolume.bitsRepresentingPeak)); + data.append(static_cast(channel.peakVolume.bitsRepresentingPeak)); data.append(channel.peakVolume.peakVolume); } diff --git a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp index 6a62bb49..fbc8809d 100644 --- a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp +++ b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp @@ -150,10 +150,10 @@ void SynchronizedLyricsFrame::parseFields(const ByteVector &data) return; } - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); d->language = data.mid(1, 3); - d->timestampFormat = TimestampFormat(data[4]); - d->type = Type(data[5]); + d->timestampFormat = static_cast(data[4]); + d->type = static_cast(data[5]); int pos = 6; @@ -212,10 +212,10 @@ ByteVector SynchronizedLyricsFrame::renderFields() const encoding = checkTextEncoding(it->text, encoding); } - v.append(char(encoding)); + v.append(static_cast(encoding)); v.append(d->language.size() == 3 ? d->language : "XXX"); - v.append(char(d->timestampFormat)); - v.append(char(d->type)); + v.append(static_cast(d->timestampFormat)); + v.append(static_cast(d->type)); v.append(d->description.data(encoding)); v.append(textDelimiter(encoding)); for(SynchedTextList::ConstIterator it = d->synchedText.begin(); diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp index d40b683d..cda40d95 100644 --- a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -194,7 +194,7 @@ void TextIdentificationFrame::parseFields(const ByteVector &data) // read the string data type (the first byte of the field data) - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); // split the byte array into chunks based on the string type (two byte delimiter // for unicode encodings) @@ -254,7 +254,7 @@ ByteVector TextIdentificationFrame::renderFields() const ByteVector v; - v.append(char(encoding)); + v.append(static_cast(encoding)); for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) { diff --git a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp index fcb855b2..dd26482a 100644 --- a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp +++ b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp @@ -134,7 +134,7 @@ ByteVector UniqueFileIdentifierFrame::renderFields() const ByteVector data; data.append(d->owner.data(String::Latin1)); - data.append(char(0)); + data.append(static_cast(0)); data.append(d->identifier); return data; diff --git a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp index eafae171..db089dbf 100644 --- a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp +++ b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp @@ -147,7 +147,7 @@ void UnsynchronizedLyricsFrame::parseFields(const ByteVector &data) return; } - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); d->language = data.mid(1, 3); int byteAlign @@ -177,7 +177,7 @@ ByteVector UnsynchronizedLyricsFrame::renderFields() const ByteVector v; - v.append(char(encoding)); + v.append(static_cast(encoding)); v.append(d->language.size() == 3 ? d->language : "XXX"); v.append(d->description.data(encoding)); v.append(textDelimiter(encoding)); diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/taglib/mpeg/id3v2/frames/urllinkframe.cpp index 543b5184..9e7982d4 100644 --- a/taglib/mpeg/id3v2/frames/urllinkframe.cpp +++ b/taglib/mpeg/id3v2/frames/urllinkframe.cpp @@ -201,7 +201,7 @@ void UserUrlLinkFrame::parseFields(const ByteVector &data) int pos = 0; - d->textEncoding = String::Type(data[0]); + d->textEncoding = static_cast(data[0]); pos += 1; if(d->textEncoding == String::Latin1 || d->textEncoding == String::UTF8) { @@ -230,7 +230,7 @@ ByteVector UserUrlLinkFrame::renderFields() const String::Type encoding = checkTextEncoding(d->description, d->textEncoding); - v.append(char(encoding)); + v.append(static_cast(encoding)); v.append(d->description.data(encoding)); v.append(textDelimiter(encoding)); v.append(url().data(String::Latin1)); diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp index ae735b54..1cf07ebf 100644 --- a/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/taglib/mpeg/id3v2/id3v2frame.cpp @@ -815,7 +815,7 @@ bool Frame::Header::dataLengthIndicator() const ByteVector Frame::Header::render() const { - ByteVector flags(2, char(0)); // just blank for the moment + ByteVector flags(2, static_cast(0)); // just blank for the moment ByteVector v = d->frameID + (d->version == 3 diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index f59af52a..23a70ca7 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -348,13 +348,13 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const tdat && tdat->data().size() >= 5) { - String date(tdat->data().mid(1), String::Type(tdat->data()[0])); + String date(tdat->data().mid(1), static_cast(tdat->data()[0])); if(date.length() == 4) { tdrc->setText(tdrc->toString() + '-' + date.substr(2, 2) + '-' + date.substr(0, 2)); if(tag->frameList("TIME").size() == 1) { UnknownFrame *timeframe = dynamic_cast(tag->frameList("TIME").front()); if(timeframe && timeframe->data().size() >= 5) { - String time(timeframe->data().mid(1), String::Type(timeframe->data()[0])); + String time(timeframe->data().mid(1), static_cast(timeframe->data()[0])); if(time.length() == 4) { tdrc->setText(tdrc->toString() + 'T' + time.substr(0, 2) + ':' + time.substr(2, 2)); } diff --git a/taglib/mpeg/id3v2/id3v2header.cpp b/taglib/mpeg/id3v2/id3v2header.cpp index 3496cff6..6a6e3b2b 100644 --- a/taglib/mpeg/id3v2/id3v2header.cpp +++ b/taglib/mpeg/id3v2/id3v2header.cpp @@ -160,8 +160,8 @@ ByteVector Header::render() const // add the version number -- we always render a 2.4.0 tag regardless of what // the tag originally was. - v.append(char(majorVersion())); - v.append(char(0)); + v.append(static_cast(majorVersion())); + v.append(static_cast(0)); // Currently we don't actually support writing extended headers, footers or // unsynchronized tags, make sure that the flags are set accordingly. @@ -178,7 +178,7 @@ ByteVector Header::render() const flags[5] = d->experimentalIndicator; flags[4] = d->footerPresent; - v.append(char(flags.to_ulong())); + v.append(static_cast(flags.to_ulong())); // add the size v.append(SynchData::fromUInt(d->tagSize)); diff --git a/taglib/ogg/oggpage.cpp b/taglib/ogg/oggpage.cpp index 8cd15a5c..869c357a 100644 --- a/taglib/ogg/oggpage.cpp +++ b/taglib/ogg/oggpage.cpp @@ -103,10 +103,10 @@ Ogg::Page::ContainsPacketFlags Ogg::Page::containsPacket(int index) const ContainsPacketFlags flags = DoesNotContainPacket; if(index == d->firstPacketIndex) - flags = ContainsPacketFlags(flags | BeginsWithPacket); + flags = static_cast(flags | BeginsWithPacket); if(index == lastPacketIndex) - flags = ContainsPacketFlags(flags | EndsWithPacket); + flags = static_cast(flags | EndsWithPacket); // If there's only one page and it's complete: @@ -114,7 +114,7 @@ Ogg::Page::ContainsPacketFlags Ogg::Page::containsPacket(int index) const !d->header.firstPacketContinued() && d->header.lastPacketCompleted()) { - flags = ContainsPacketFlags(flags | CompletePacket); + flags = static_cast(flags | CompletePacket); } // Or if there is more than one page and the page is @@ -126,7 +126,7 @@ Ogg::Page::ContainsPacketFlags Ogg::Page::containsPacket(int index) const (flags & EndsWithPacket && d->header.lastPacketCompleted()) || (!(flags & BeginsWithPacket) && !(flags & EndsWithPacket)))) { - flags = ContainsPacketFlags(flags | CompletePacket); + flags = static_cast(flags | CompletePacket); } return flags; diff --git a/taglib/ogg/oggpageheader.cpp b/taglib/ogg/oggpageheader.cpp index b867567c..3c3c4ee1 100644 --- a/taglib/ogg/oggpageheader.cpp +++ b/taglib/ogg/oggpageheader.cpp @@ -183,7 +183,7 @@ ByteVector Ogg::PageHeader::render() const // stream structure version - data.append(char(0)); + data.append(static_cast(0)); // header type flag @@ -192,7 +192,7 @@ ByteVector Ogg::PageHeader::render() const flags[1] = d->pageSequenceNumber == 0; flags[2] = d->lastPageOfStream; - data.append(char(flags.to_ulong())); + data.append(static_cast(flags.to_ulong())); // absolute granular position @@ -262,7 +262,7 @@ void Ogg::PageHeader::read(Ogg::File *file, long pageOffset) // Another sanity check. - if(pageSegmentCount < 1 || int(pageSegments.size()) != pageSegmentCount) + if(pageSegmentCount < 1 || static_cast(pageSegments.size()) != pageSegmentCount) return; // The base size of an Ogg page 27 bytes plus the number of lacing values. diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp index 2b0e8995..562e71ed 100644 --- a/taglib/ogg/xiphcomment.cpp +++ b/taglib/ogg/xiphcomment.cpp @@ -408,7 +408,7 @@ ByteVector Ogg::XiphComment::render(bool addFramingBit) const // Append the "framing bit". if(addFramingBit) - data.append(char(1)); + data.append(static_cast(1)); return data; } diff --git a/taglib/toolkit/tbytevectorlist.cpp b/taglib/toolkit/tbytevectorlist.cpp index e71d4a7a..1881376f 100644 --- a/taglib/toolkit/tbytevectorlist.cpp +++ b/taglib/toolkit/tbytevectorlist.cpp @@ -49,7 +49,7 @@ ByteVectorList ByteVectorList::split(const ByteVector &v, const ByteVector &patt unsigned int previousOffset = 0; for(int offset = v.find(pattern, 0, byteAlign); - offset != -1 && (max == 0 || max > int(l.size()) + 1); + offset != -1 && (max == 0 || max > static_cast(l.size()) + 1); offset = v.find(pattern, offset + pattern.size(), byteAlign)) { if(offset - previousOffset >= 1) diff --git a/taglib/toolkit/tbytevectorstream.cpp b/taglib/toolkit/tbytevectorstream.cpp index 333f528c..bce3a7c6 100644 --- a/taglib/toolkit/tbytevectorstream.cpp +++ b/taglib/toolkit/tbytevectorstream.cpp @@ -65,7 +65,7 @@ ByteVectorStream::~ByteVectorStream() FileName ByteVectorStream::name() const { - return FileName(""); // XXX do we need a name? + return ""; // XXX do we need a name? } ByteVector ByteVectorStream::readBlock(unsigned long length) @@ -81,7 +81,7 @@ ByteVector ByteVectorStream::readBlock(unsigned long length) void ByteVectorStream::writeBlock(const ByteVector &data) { unsigned int size = data.size(); - if(long(d->position + size) > length()) { + if(d->position + size > length()) { truncate(d->position + size); } memcpy(d->data.data() + d->position, data.data(), size); diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp index 9ea217e6..4f7bf6e7 100644 --- a/taglib/toolkit/tfile.cpp +++ b/taglib/toolkit/tfile.cpp @@ -278,7 +278,7 @@ long File::find(const ByteVector &pattern, long fromOffset, const ByteVector &be // (1) previous partial match - if(previousPartialMatch >= 0 && int(bufferSize()) > previousPartialMatch) { + if(previousPartialMatch >= 0 && static_cast(bufferSize()) > previousPartialMatch) { const int patternOffset = (bufferSize() - previousPartialMatch); if(buffer.containsAt(pattern, 0, patternOffset)) { seek(originalPosition); @@ -286,7 +286,7 @@ long File::find(const ByteVector &pattern, long fromOffset, const ByteVector &be } } - if(!before.isEmpty() && beforePreviousPartialMatch >= 0 && int(bufferSize()) > beforePreviousPartialMatch) { + if(!before.isEmpty() && beforePreviousPartialMatch >= 0 && static_cast(bufferSize()) > beforePreviousPartialMatch) { const int beforeOffset = (bufferSize() - beforePreviousPartialMatch); if(buffer.containsAt(before, 0, beforeOffset)) { seek(originalPosition); @@ -428,7 +428,7 @@ bool File::isValid() const void File::seek(long offset, Position p) { - d->stream->seek(offset, IOStream::Position(p)); + d->stream->seek(offset, static_cast(p)); } void File::truncate(long length)