dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

taglib: Change while to for loop in TableOfContentsFrame

Browse Source
This commit is contained in:
Jonas Kvinge
2021-02-13 00:41:49 +01:00
parent 295db43bca
commit 877319a8e5
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp vendored
View File

@@ -204,9 +204,7 @@ String TableOfContentsFrame::toString() const {
if (!d->embeddedFrameList.isEmpty()) { if (!d->embeddedFrameList.isEmpty()) {
StringList frameIDs; StringList frameIDs;
for (FrameList::ConstIterator it = d->embeddedFrameList.begin(); for (FrameList::ConstIterator it = d->embeddedFrameList.begin(); it != d->embeddedFrameList.end(); ++it)
it != d->embeddedFrameList.end();
++it)
frameIDs.append((*it)->frameID()); frameIDs.append((*it)->frameID());
s += ", sub-frames: [ " + frameIDs.toString(", ") + " ]"; s += ", sub-frames: [ " + frameIDs.toString(", ") + " ]";
} }
@@ -245,9 +243,7 @@ TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const ID3v2::Tag *tag)
ID3v2::FrameList tablesOfContents = tag->frameList("CTOC"); ID3v2::FrameList tablesOfContents = tag->frameList("CTOC");
for (ID3v2::FrameList::ConstIterator it = tablesOfContents.begin(); for (ID3v2::FrameList::ConstIterator it = tablesOfContents.begin(); it != tablesOfContents.end(); ++it) {
it != tablesOfContents.end();
++it) {
TableOfContentsFrame *frame = dynamic_cast<TableOfContentsFrame *>(*it); TableOfContentsFrame *frame = dynamic_cast<TableOfContentsFrame *>(*it);
if (frame && frame->isTopLevel() == true) if (frame && frame->isTopLevel() == true)
return frame; return frame;
@@ -314,15 +310,14 @@ ByteVector TableOfContentsFrame::renderFields() const {
flags += 1; flags += 1;
data.append(flags); data.append(flags);
data.append(static_cast<char>(entryCount())); data.append(static_cast<char>(entryCount()));
ByteVectorList::ConstIterator it = d->childElements.begin();
while (it != d->childElements.end()) { for (ByteVectorList::ConstIterator it = d->childElements.begin() ; it != d->childElements.end() ; ++it) {
data.append(*it); data.append(*it);
data.append('\0'); data.append('\0');
it++;
} }
FrameList l = d->embeddedFrameList; FrameList l = d->embeddedFrameList;
for (FrameList::ConstIterator it2 = l.begin(); it2 != l.end(); ++it2) for (FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
data.append((*it2)->render()); data.append((*it)->render());
return data; return data;