From 761e3ee44bea624c80e8e7a3a467ed42507bc0df Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 18 Dec 2020 21:13:52 +0100 Subject: [PATCH] Mark all "final" tag, track and container classes as such --- adts/adtsstream.h | 2 +- flac/flacstream.h | 2 +- id3/id3v1tag.h | 2 +- id3/id3v2tag.h | 2 +- ivf/ivfstream.h | 2 +- matroska/matroskaattachment.h | 2 +- matroska/matroskacontainer.h | 2 +- matroska/matroskatag.h | 2 +- mp4/mp4container.h | 2 +- mp4/mp4tag.h | 2 +- mp4/mp4track.h | 2 +- mpegaudio/mpegaudioframestream.h | 2 +- ogg/oggcontainer.h | 4 ++-- ogg/oggstream.h | 2 +- wav/waveaudiostream.h | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/adts/adtsstream.h b/adts/adtsstream.h index 4ab013c..3e79573 100644 --- a/adts/adtsstream.h +++ b/adts/adtsstream.h @@ -7,7 +7,7 @@ namespace TagParser { -class TAG_PARSER_EXPORT AdtsStream : public AbstractTrack { +class TAG_PARSER_EXPORT AdtsStream final : public AbstractTrack { public: AdtsStream(std::iostream &stream, std::uint64_t startOffset); ~AdtsStream() override; diff --git a/flac/flacstream.h b/flac/flacstream.h index b189bde..155ddb7 100644 --- a/flac/flacstream.h +++ b/flac/flacstream.h @@ -11,7 +11,7 @@ namespace TagParser { class MediaFileInfo; class VorbisComment; -class TAG_PARSER_EXPORT FlacStream : public AbstractTrack { +class TAG_PARSER_EXPORT FlacStream final : public AbstractTrack { public: FlacStream(MediaFileInfo &mediaFileInfo, std::uint64_t startOffset); ~FlacStream() override; diff --git a/id3/id3v1tag.h b/id3/id3v1tag.h index 78c6c3c..a99104f 100644 --- a/id3/id3v1tag.h +++ b/id3/id3v1tag.h @@ -7,7 +7,7 @@ namespace TagParser { class Diagnostics; -class TAG_PARSER_EXPORT Id3v1Tag : public Tag { +class TAG_PARSER_EXPORT Id3v1Tag final : public Tag { public: Id3v1Tag(); diff --git a/id3/id3v2tag.h b/id3/id3v2tag.h index 5fccb4d..d4a35d9 100644 --- a/id3/id3v2tag.h +++ b/id3/id3v2tag.h @@ -58,7 +58,7 @@ public: using Compare = FrameComparer; }; -class TAG_PARSER_EXPORT Id3v2Tag : public FieldMapBasedTag { +class TAG_PARSER_EXPORT Id3v2Tag final : public FieldMapBasedTag { friend class FieldMapBasedTag; friend class Id3v2TagMaker; diff --git a/ivf/ivfstream.h b/ivf/ivfstream.h index de761e4..6b4f3d1 100644 --- a/ivf/ivfstream.h +++ b/ivf/ivfstream.h @@ -7,7 +7,7 @@ namespace TagParser { -class TAG_PARSER_EXPORT IvfStream : public AbstractTrack { +class TAG_PARSER_EXPORT IvfStream final : public AbstractTrack { public: IvfStream(std::iostream &stream, std::uint64_t startOffset); ~IvfStream() override; diff --git a/matroska/matroskaattachment.h b/matroska/matroskaattachment.h index ea47e55..5559c1e 100644 --- a/matroska/matroskaattachment.h +++ b/matroska/matroskaattachment.h @@ -41,7 +41,7 @@ inline std::uint64_t MatroskaAttachmentMaker::requiredSize() const return m_totalSize; } -class TAG_PARSER_EXPORT MatroskaAttachment : public AbstractAttachment { +class TAG_PARSER_EXPORT MatroskaAttachment final : public AbstractAttachment { public: MatroskaAttachment(); diff --git a/matroska/matroskacontainer.h b/matroska/matroskacontainer.h index c07428f..58fe8cc 100644 --- a/matroska/matroskacontainer.h +++ b/matroska/matroskacontainer.h @@ -21,7 +21,7 @@ class MatroskaEditionEntry; class MediaFileInfo; -class TAG_PARSER_EXPORT MatroskaContainer : public GenericContainer { +class TAG_PARSER_EXPORT MatroskaContainer final : public GenericContainer { public: MatroskaContainer(MediaFileInfo &stream, std::uint64_t startOffset); ~MatroskaContainer() override; diff --git a/matroska/matroskatag.h b/matroska/matroskatag.h index 836e11d..8fcddce 100644 --- a/matroska/matroskatag.h +++ b/matroska/matroskatag.h @@ -55,7 +55,7 @@ public: using Compare = std::less; }; -class TAG_PARSER_EXPORT MatroskaTag : public FieldMapBasedTag { +class TAG_PARSER_EXPORT MatroskaTag final : public FieldMapBasedTag { friend class FieldMapBasedTag; public: diff --git a/mp4/mp4container.h b/mp4/mp4container.h index 131fe2f..3a9d511 100644 --- a/mp4/mp4container.h +++ b/mp4/mp4container.h @@ -15,7 +15,7 @@ namespace TagParser { class MediaFileInfo; -class TAG_PARSER_EXPORT Mp4Container : public GenericContainer { +class TAG_PARSER_EXPORT Mp4Container final : public GenericContainer { public: Mp4Container(MediaFileInfo &fileInfo, std::uint64_t startOffset); ~Mp4Container() override; diff --git a/mp4/mp4tag.h b/mp4/mp4tag.h index 20d0212..4469ee2 100644 --- a/mp4/mp4tag.h +++ b/mp4/mp4tag.h @@ -94,7 +94,7 @@ public: using Compare = std::less; }; -class TAG_PARSER_EXPORT Mp4Tag : public FieldMapBasedTag { +class TAG_PARSER_EXPORT Mp4Tag final : public FieldMapBasedTag { friend class FieldMapBasedTag; public: diff --git a/mp4/mp4track.h b/mp4/mp4track.h index 1966093..8dcbaaf 100644 --- a/mp4/mp4track.h +++ b/mp4/mp4track.h @@ -115,7 +115,7 @@ inline bool Mpeg4ElementaryStreamInfo::upstream() const return decCfgDescFlags & 0x02; } -class TAG_PARSER_EXPORT Mp4Track : public AbstractTrack { +class TAG_PARSER_EXPORT Mp4Track final : public AbstractTrack { public: Mp4Track(Mp4Atom &trakAtom); ~Mp4Track() override; diff --git a/mpegaudio/mpegaudioframestream.h b/mpegaudio/mpegaudioframestream.h index b4e28f1..b7f9c1c 100644 --- a/mpegaudio/mpegaudioframestream.h +++ b/mpegaudio/mpegaudioframestream.h @@ -9,7 +9,7 @@ namespace TagParser { -class TAG_PARSER_EXPORT MpegAudioFrameStream : public AbstractTrack { +class TAG_PARSER_EXPORT MpegAudioFrameStream final : public AbstractTrack { public: MpegAudioFrameStream(std::iostream &stream, std::uint64_t startOffset); ~MpegAudioFrameStream() override; diff --git a/ogg/oggcontainer.h b/ogg/oggcontainer.h index 8804d7b..ed0714d 100644 --- a/ogg/oggcontainer.h +++ b/ogg/oggcontainer.h @@ -64,7 +64,7 @@ inline void OggParameter::set(std::size_t pageIndex, std::size_t segmentIndex, b this->streamFormat = streamFormat; } -class TAG_PARSER_EXPORT OggVorbisComment : public VorbisComment { +class TAG_PARSER_EXPORT OggVorbisComment final : public VorbisComment { friend class OggContainer; public: @@ -126,7 +126,7 @@ inline const OggParameter &OggVorbisComment::oggParams() const return m_oggParams; } -class TAG_PARSER_EXPORT OggContainer : public GenericContainer { +class TAG_PARSER_EXPORT OggContainer final : public GenericContainer { friend class OggStream; public: diff --git a/ogg/oggstream.h b/ogg/oggstream.h index 57225cf..21e67b6 100644 --- a/ogg/oggstream.h +++ b/ogg/oggstream.h @@ -10,7 +10,7 @@ namespace TagParser { class OggContainer; class OggIterator; -class TAG_PARSER_EXPORT OggStream : public AbstractTrack { +class TAG_PARSER_EXPORT OggStream final : public AbstractTrack { friend class OggContainer; public: diff --git a/wav/waveaudiostream.h b/wav/waveaudiostream.h index 2c01857..f881040 100644 --- a/wav/waveaudiostream.h +++ b/wav/waveaudiostream.h @@ -48,7 +48,7 @@ constexpr std::uint32_t WaveFormatHeader::bitrate() const return bitsPerSample * sampleRate * channelCount; } -class TAG_PARSER_EXPORT WaveAudioStream : public AbstractTrack { +class TAG_PARSER_EXPORT WaveAudioStream final : public AbstractTrack { public: WaveAudioStream(std::iostream &stream, std::uint64_t startOffset); ~WaveAudioStream() override;