diff --git a/genericfileelement.h b/genericfileelement.h index dc6363f..93ee81c 100644 --- a/genericfileelement.h +++ b/genericfileelement.h @@ -453,7 +453,7 @@ template inline const ImplementationType *GenericFile * \brief Returns the first child of the element. * * The current element keeps ownership over the returned element. - * If no childs are present nullptr is returned. + * If no children are present nullptr is returned. * * \remarks parse() needs to be called before. */ @@ -466,7 +466,7 @@ template inline ImplementationType *GenericFileElemen * \brief Returns the first child of the element. * * The current element keeps ownership over the returned element. - * If no childs are present nullptr is returned. + * If no children are present nullptr is returned. * * \remarks parse() needs to be called before. */ @@ -479,7 +479,7 @@ template inline const ImplementationType *GenericFile * \brief Returns the last child of the element. * * The current element keeps ownership over the returned element. - * If no childs are present nullptr is returned. + * If no children are present nullptr is returned. * * \remarks parse() needs to be called before. */ @@ -497,7 +497,7 @@ template inline ImplementationType *GenericFileElemen * \brief Returns the last child of the element. * * The current element keeps ownership over the returned element. - * If no childs are present nullptr is returned. + * If no children are present nullptr is returned. * * \remarks parse() needs to be called before. */ @@ -843,7 +843,7 @@ void GenericFileElement::copyHeader(std::ostream &targetStre } /*! - * \brief Writes the element without its childs to the specified \a targetStream. + * \brief Writes the element without its children to the specified \a targetStream. */ template void GenericFileElement::copyWithoutChilds(std::ostream &targetStream, Diagnostics &diag, AbortableProgressFeedback *progress) @@ -856,7 +856,7 @@ void GenericFileElement::copyWithoutChilds(std::ostream &tar } /*! - * \brief Writes the entire element including all childs to the specified \a targetStream. + * \brief Writes the entire element including all children to the specified \a targetStream. */ template void GenericFileElement::copyEntirely(std::ostream &targetStream, Diagnostics &diag, AbortableProgressFeedback *progress) diff --git a/matroska/matroskachapter.cpp b/matroska/matroskachapter.cpp index 7046d79..80f6d21 100644 --- a/matroska/matroskachapter.cpp +++ b/matroska/matroskachapter.cpp @@ -44,7 +44,7 @@ void MatroskaChapter::internalParse(Diagnostics &diag) // clear previous values and status static const string context("parsing \"ChapterAtom\"-element"); clear(); - // iterate through childs of "ChapterAtom"-element + // iterate through children of "ChapterAtom"-element for (EbmlElement *chapterAtomChild = m_chapterAtomElement->firstChild(); chapterAtomChild; chapterAtomChild = chapterAtomChild->nextSibling()) { chapterAtomChild->parse(diag); switch (chapterAtomChild->id()) { diff --git a/matroska/matroskacontainer.cpp b/matroska/matroskacontainer.cpp index 543aa34..4c0ce4b 100644 --- a/matroska/matroskacontainer.cpp +++ b/matroska/matroskacontainer.cpp @@ -105,7 +105,7 @@ void MatroskaContainer::validateIndex(Diagnostics &diag) break; case MatroskaIds::Cues: cuesElementsFound = true; - // parse childs of "Cues"-element ("CuePoint"-elements) + // parse children of "Cues"-element ("CuePoint"-elements) for (EbmlElement *cuePointElement = segmentChildElement->firstChild(); cuePointElement; cuePointElement = cuePointElement->nextSibling()) { cuePointElement->parse(diag); @@ -115,7 +115,7 @@ void MatroskaContainer::validateIndex(Diagnostics &diag) case EbmlIds::Crc32: break; case MatroskaIds::CuePoint: - // parse childs of "CuePoint"-element + // parse children of "CuePoint"-element for (EbmlElement *cuePointChildElement = cuePointElement->firstChild(); cuePointChildElement; cuePointChildElement = cuePointChildElement->nextSibling()) { cuePointChildElement->parse(diag); @@ -250,7 +250,7 @@ void MatroskaContainer::validateIndex(Diagnostics &diag) } break; case MatroskaIds::Cluster: - // parse childs of "Cluster"-element + // parse children of "Cluster"-element for (EbmlElement *clusterElementChild = segmentChildElement->firstChild(); clusterElementChild; clusterElementChild = clusterElementChild->nextSibling()) { clusterElementChild->parse(diag); @@ -459,7 +459,7 @@ void MatroskaContainer::internalParseHeader(Diagnostics &diag) break; } } catch (const Failure &) { - diag.emplace_back(DiagLevel::Critical, "Unable to parse all childs of EBML header.", context); + diag.emplace_back(DiagLevel::Critical, "Unable to parse all children of EBML header.", context); break; } } @@ -567,7 +567,7 @@ void MatroskaContainer::internalParseHeader(Diagnostics &diag) break; } } catch (const Failure &) { - diag.emplace_back(DiagLevel::Critical, "Unable to parse all childs of \"Segment\"-element.", context); + diag.emplace_back(DiagLevel::Critical, "Unable to parse all children of \"Segment\"-element.", context); break; } } @@ -1112,7 +1112,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee segment.infoDataSize += 2 + EbmlElement::calculateSizeDenotationLength(title.size()) + title.size(); } } - // -> add size of other childs + // -> add size of other children for (level2Element = level1Element->firstChild(); level2Element; level2Element = level2Element->nextSibling()) { level2Element->parse(diag); switch (level2Element->id()) { @@ -1593,7 +1593,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee outputWriter.writeUInt32BE(MatroskaIds::SegmentInfo); sizeLength = EbmlElement::makeSizeDenotation(segment.infoDataSize, buff); outputStream.write(buff, sizeLength); - // -> write childs + // -> write children for (level2Element = level1Element->firstChild(); level2Element; level2Element = level2Element->nextSibling()) { switch (level2Element->id()) { case EbmlIds::Void: // skipped @@ -1699,7 +1699,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee outputWriter.writeUInt32BE(MatroskaIds::Cluster); sizeLength = EbmlElement::makeSizeDenotation(*clusterSizesIterator, buff); outputStream.write(buff, sizeLength); - // write childs + // write children for (level2Element = level1Element->firstChild(); level2Element; level2Element = level2Element->nextSibling()) { switch (level2Element->id()) { case EbmlIds::Void: diff --git a/matroska/matroskacues.cpp b/matroska/matroskacues.cpp index ba9e1f3..39051d7 100644 --- a/matroska/matroskacues.cpp +++ b/matroska/matroskacues.cpp @@ -56,7 +56,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di std::uint64_t cuesElementSize = 0, cuePointElementSize, cueTrackPositionsElementSize, cueReferenceElementSize, pos, relPos, statePos; EbmlElement *cueRelativePositionElement, *cueClusterPositionElement; for (EbmlElement *cuePointElement = cuesElement->firstChild(); cuePointElement; cuePointElement = cuePointElement->nextSibling()) { - // parse childs of "Cues"-element which must be "CuePoint"-elements + // parse children of "Cues"-element which must be "CuePoint"-elements cuePointElement->parse(diag); switch (cuePointElement->id()) { case EbmlIds::Void: @@ -65,7 +65,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di case MatroskaIds::CuePoint: cuePointElementSize = 0; for (EbmlElement *cuePointChild = cuePointElement->firstChild(); cuePointChild; cuePointChild = cuePointChild->nextSibling()) { - // parse childs of "CuePoint"-element + // parse children of "CuePoint"-element cuePointChild->parse(diag); switch (cuePointChild->id()) { case EbmlIds::Void: @@ -80,7 +80,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di cueRelativePositionElement = cueClusterPositionElement = nullptr; for (EbmlElement *cueTrackPositionsChild = cuePointChild->firstChild(); cueTrackPositionsChild; cueTrackPositionsChild = cueTrackPositionsChild->nextSibling()) { - // parse childs of "CueTrackPositions"-element + // parse children of "CueTrackPositions"-element cueTrackPositionsChild->parse(diag); switch (cueTrackPositionsChild->id()) { case MatroskaIds::CueTrack: @@ -106,7 +106,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di cueReferenceElementSize = 0; for (EbmlElement *cueReferenceChild = cueTrackPositionsChild->firstChild(); cueReferenceChild; cueReferenceChild = cueReferenceChild->nextSibling()) { - // parse childs of "CueReference"-element + // parse children of "CueReference"-element cueReferenceChild->parse(diag); switch (cueReferenceChild->id()) { case EbmlIds::Void: @@ -293,7 +293,7 @@ void MatroskaCuePositionUpdater::make(ostream &stream, Diagnostics &diag) case MatroskaIds::CueTrack: case MatroskaIds::CueDuration: case MatroskaIds::CueBlockNumber: - // write unchanged childs of "CueTrackPositions"-element + // write unchanged children of "CueTrackPositions"-element cueTrackPositionsChild->copyBuffer(stream); cueTrackPositionsChild->discardBuffer(); //cueTrackPositionsChild->copyEntirely(stream); @@ -327,7 +327,7 @@ void MatroskaCuePositionUpdater::make(ostream &stream, Diagnostics &diag) break; case MatroskaIds::CueRefTime: case MatroskaIds::CueRefNumber: - // write unchanged childs of "CueReference"-element + // write unchanged children of "CueReference"-element cueReferenceChild->copyBuffer(stream); cueReferenceChild->discardBuffer(); cueReferenceChild->copyEntirely(stream, diag, nullptr); diff --git a/matroska/matroskatag.cpp b/matroska/matroskatag.cpp index 10f25b0..cfa4bab 100644 --- a/matroska/matroskatag.cpp +++ b/matroska/matroskatag.cpp @@ -153,7 +153,7 @@ void MatroskaTag::parseTargets(EbmlElement &targetsElement, Diagnostics &diag) try { child->parse(diag); } catch (const Failure &) { - diag.emplace_back(DiagLevel::Critical, "Unable to parse childs of Targets element.", context); + diag.emplace_back(DiagLevel::Critical, "Unable to parse children of Targets element.", context); break; } switch (child->id()) { diff --git a/matroska/matroskatrack.cpp b/matroska/matroskatrack.cpp index e49fb9f..7ab6697 100644 --- a/matroska/matroskatrack.cpp +++ b/matroska/matroskatrack.cpp @@ -289,7 +289,7 @@ void MatroskaTrack::internalParseHeader(Diagnostics &diag) diag.emplace_back(DiagLevel::Critical, "Unable to parse track element.", context); throw; } - // read information about the track from the childs of the track entry element + // read information about the track from the children of the track entry element for (EbmlElement *trackInfoElement = m_trackElement->firstChild(), *subElement = nullptr; trackInfoElement; trackInfoElement = trackInfoElement->nextSibling()) { try { diff --git a/mp4/mp4atom.cpp b/mp4/mp4atom.cpp index 1ddfcbf..9330ebc 100644 --- a/mp4/mp4atom.cpp +++ b/mp4/mp4atom.cpp @@ -258,8 +258,8 @@ bool Mp4Atom::isPadding() const * * \remarks This information is not read from the atom header. The offsets are known * for specific atoms. - * \remarks This method returns zero for non-parent atoms which have no childs. - * \remarks Childs with variable offset such as the "esds"-atom must be denoted! + * \remarks This method returns zero for non-parent atoms which have no children. + * \remarks Children with variable offset such as the "esds"-atom must be denoted! */ std::uint64_t Mp4Atom::firstChildOffset() const { diff --git a/mp4/mp4container.cpp b/mp4/mp4container.cpp index 979c72f..3042356 100644 --- a/mp4/mp4container.cpp +++ b/mp4/mp4container.cpp @@ -377,7 +377,7 @@ void Mp4Container::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback // ignore meta data here; it is added separately break; default: - // add size of unknown childs of the user data atom + // add size of unknown children of the user data atom userDataAtomSize += level2Atom->totalSize(); level2Atom->makeBuffer(); } @@ -392,7 +392,7 @@ void Mp4Container::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback // ignore track atoms here; they are added separately break; default: - // add size of unknown childs of the movie atom + // add size of unknown children of the movie atom movieAtomSize += level1Atom->totalSize(); level1Atom->makeBuffer(); } @@ -962,7 +962,7 @@ void Mp4Container::updateOffsets(const std::vector &oldMdatOffsets } } } catch (const Failure &) { - diag.emplace_back(DiagLevel::Critical, "Unable to parse childs of top-level atom moof.", context); + diag.emplace_back(DiagLevel::Critical, "Unable to parse children of top-level atom moof.", context); } } } catch (const Failure &) { diff --git a/mp4/mp4tagfield.cpp b/mp4/mp4tagfield.cpp index 2927c9c..b03fdd3 100644 --- a/mp4/mp4tagfield.cpp +++ b/mp4/mp4tagfield.cpp @@ -257,7 +257,7 @@ void Mp4TagField::reparse(Mp4Atom &ilstChild, Diagnostics &diag) "Unkown child atom \"" % dataAtom->idToString() + "\" in tag atom (ilst child) found. (will be ignored)", context); } } catch (const Failure &) { - diag.emplace_back(DiagLevel::Warning, "Unable to parse all childs atom in tag atom (ilst child) found. (will be ignored)", context); + diag.emplace_back(DiagLevel::Warning, "Unable to parse all children atom in tag atom (ilst child) found. (will be ignored)", context); } } if (value().isEmpty()) { diff --git a/mp4/mp4track.cpp b/mp4/mp4track.cpp index ed81f04..5455266 100644 --- a/mp4/mp4track.cpp +++ b/mp4/mp4track.cpp @@ -1110,7 +1110,7 @@ std::uint64_t Mp4Track::requiredSize(Diagnostics &diag) const } // ... mdia header + hdlr total size + minf header size += 8 + (33 + m_name.size()) + 8; - // ... minf childs + // ... minf children bool dinfAtomWritten = false; if (m_minfAtom) { for (Mp4Atom *childAtom = m_minfAtom->firstChild(); childAtom; childAtom = childAtom->nextSibling()) {