clang-tidy: avoid C casting

Found with google-readability-casting

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2022-11-26 22:02:47 -08:00
committed by Urs Fleisch
parent 4dc6bdcd28
commit 983a35f5ae
27 changed files with 64 additions and 64 deletions

View File

@@ -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<char>(0));
data.append(static_cast<char>(d->track));
data.append(static_cast<char>(d->genre));
return data;
}

View File

@@ -133,7 +133,7 @@ void AttachedPictureFrame::parseFields(const ByteVector &data)
return;
}
d->textEncoding = String::Type(data[0]);
d->textEncoding = static_cast<String::Type>(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<char>(encoding));
data.append(d->mimeType.data(String::Latin1));
data.append(textDelimiter(String::Latin1));
data.append(char(d->type));
data.append(static_cast<char>(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<String::Type>(data[0]);
int pos = 1;

View File

@@ -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<char>(0)))
d->elementID = d->elementID.mid(0, d->elementID.size() - 1);
}

View File

@@ -150,7 +150,7 @@ void CommentsFrame::parseFields(const ByteVector &data)
return;
}
d->textEncoding = String::Type(data[0]);
d->textEncoding = static_cast<String::Type>(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<char>(encoding));
v.append(d->language.size() == 3 ? d->language : "XXX");
v.append(d->description.data(encoding));
v.append(textDelimiter(encoding));

View File

@@ -104,7 +104,7 @@ void EventTimingCodesFrame::parseFields(const ByteVector &data)
return;
}
d->timestampFormat = TimestampFormat(data[0]);
d->timestampFormat = static_cast<TimestampFormat>(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<char>(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<char>(entry.type));
v.append(ByteVector::fromUInt(entry.time));
}

View File

@@ -142,7 +142,7 @@ void GeneralEncapsulatedObjectFrame::parseFields(const ByteVector &data)
return;
}
d->textEncoding = String::Type(data[0]);
d->textEncoding = static_cast<String::Type>(data[0]);
int pos = 1;
@@ -163,7 +163,7 @@ ByteVector GeneralEncapsulatedObjectFrame::renderFields() const
ByteVector data;
data.append(char(encoding));
data.append(static_cast<char>(encoding));
data.append(d->mimeType.data(String::Latin1));
data.append(textDelimiter(String::Latin1));
data.append(d->fileName.data(encoding));

View File

@@ -123,7 +123,7 @@ void OwnershipFrame::parseFields(const ByteVector &data)
}
// Get the text encoding
d->textEncoding = String::Type(data[0]);
d->textEncoding = static_cast<String::Type>(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<char>(encoding));
v.append(d->pricePaid.data(String::Latin1));
v.append(textDelimiter(String::Latin1));
v.append(d->datePurchased.data(String::Latin1));

View File

@@ -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<int>(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<char>(d->rating));
data.append(ByteVector::fromUInt(d->counter));
return data;

View File

@@ -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<float>(d->channels[type].volumeAdjustment) / static_cast<float>(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<short>(adjustment * static_cast<float>(512));
}
void RelativeVolumeFrame::setVolumeAdjustment(float adjustment)
@@ -182,7 +182,7 @@ void RelativeVolumeFrame::parseFields(const ByteVector &data)
while(pos <= static_cast<int>(data.size()) - 4) {
ChannelType type = ChannelType(data[pos]);
ChannelType type = static_cast<ChannelType>(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<char>(type));
data.append(ByteVector::fromShort(channel.volumeAdjustment));
data.append(char(channel.peakVolume.bitsRepresentingPeak));
data.append(static_cast<char>(channel.peakVolume.bitsRepresentingPeak));
data.append(channel.peakVolume.peakVolume);
}

View File

@@ -150,10 +150,10 @@ void SynchronizedLyricsFrame::parseFields(const ByteVector &data)
return;
}
d->textEncoding = String::Type(data[0]);
d->textEncoding = static_cast<String::Type>(data[0]);
d->language = data.mid(1, 3);
d->timestampFormat = TimestampFormat(data[4]);
d->type = Type(data[5]);
d->timestampFormat = static_cast<TimestampFormat>(data[4]);
d->type = static_cast<Type>(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<char>(encoding));
v.append(d->language.size() == 3 ? d->language : "XXX");
v.append(char(d->timestampFormat));
v.append(char(d->type));
v.append(static_cast<char>(d->timestampFormat));
v.append(static_cast<char>(d->type));
v.append(d->description.data(encoding));
v.append(textDelimiter(encoding));
for(SynchedTextList::ConstIterator it = d->synchedText.begin();

View File

@@ -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<String::Type>(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<char>(encoding));
for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) {

View File

@@ -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<char>(0));
data.append(d->identifier);
return data;

View File

@@ -147,7 +147,7 @@ void UnsynchronizedLyricsFrame::parseFields(const ByteVector &data)
return;
}
d->textEncoding = String::Type(data[0]);
d->textEncoding = static_cast<String::Type>(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<char>(encoding));
v.append(d->language.size() == 3 ? d->language : "XXX");
v.append(d->description.data(encoding));
v.append(textDelimiter(encoding));

View File

@@ -201,7 +201,7 @@ void UserUrlLinkFrame::parseFields(const ByteVector &data)
int pos = 0;
d->textEncoding = String::Type(data[0]);
d->textEncoding = static_cast<String::Type>(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<char>(encoding));
v.append(d->description.data(encoding));
v.append(textDelimiter(encoding));
v.append(url().data(String::Latin1));

View File

@@ -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<char>(0)); // just blank for the moment
ByteVector v = d->frameID +
(d->version == 3

View File

@@ -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<String::Type>(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<UnknownFrame *>(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<String::Type>(timeframe->data()[0]));
if(time.length() == 4) {
tdrc->setText(tdrc->toString() + 'T' + time.substr(0, 2) + ':' + time.substr(2, 2));
}

View File

@@ -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<char>(majorVersion()));
v.append(static_cast<char>(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<char>(flags.to_ulong()));
// add the size
v.append(SynchData::fromUInt(d->tagSize));