From: Rosen Penev Date: Thu, 19 May 2022 00:26:42 +0000 (-0700) Subject: clang-tidy: add missing override X-Git-Tag: release-1.7.0~13^2~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f20ec1d0cfaf0dce2687afa7903a71dcf01a3267;p=libmatroska clang-tidy: add missing override Signed-off-by: Rosen Penev --- diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h index 69d67da..95a0dc6 100644 --- a/matroska/KaxBlock.h +++ b/matroska/KaxBlock.h @@ -109,9 +109,9 @@ class MATROSKA_DLL_API SimpleDataBuffer : public DataBuffer { ,Offset(aOffset) ,BaseBuffer(aBuffer) {} - virtual ~SimpleDataBuffer() {} + ~SimpleDataBuffer() override {} - DataBuffer * Clone() {return new SimpleDataBuffer(*this);} + DataBuffer * Clone() override {return new SimpleDataBuffer(*this);} protected: uint32 Offset; @@ -143,7 +143,7 @@ class MATROSKA_DLL_API NotSoSimpleDataBuffer : public SimpleDataBuffer { DECLARE_MKX_MASTER(KaxBlockGroup) public: - ~KaxBlockGroup() = default; + ~KaxBlockGroup() override = default; /*! \brief Addition of a frame without references @@ -211,8 +211,8 @@ class MATROSKA_DLL_API KaxInternalBlock : public EbmlBinary { ,ParentCluster(NULL), bIsSimple(bSimple), bIsKeyframe(true), bIsDiscardable(false) {} KaxInternalBlock(const KaxInternalBlock & ElementToClone); - ~KaxInternalBlock(); - virtual bool ValidateSize() const; + ~KaxInternalBlock() override; + bool ValidateSize() const override; uint16 TrackNum() const {return TrackNumber;} /*! @@ -223,8 +223,8 @@ class MATROSKA_DLL_API KaxInternalBlock : public EbmlBinary { /*! \note override this function to generate the Data/Size on the fly, unlike the usual binary elements */ - filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false); - filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA); + filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false) override; + filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) override; /*! \brief Only read the head of the Block (not internal data) @@ -284,7 +284,7 @@ class MATROSKA_DLL_API KaxInternalBlock : public EbmlBinary { bool mInvisible; uint64 FirstFrameLocation; - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault = false); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault = false) override; KaxCluster * ParentCluster; bool bIsSimple; @@ -358,18 +358,18 @@ protected: DECLARE_MKX_BINARY_CONS(KaxBlockVirtual) public: - ~KaxBlockVirtual(); + ~KaxBlockVirtual() override; /*! \note override this function to generate the Data/Size on the fly, unlike the usual binary elements */ - filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false); + filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false) override; void SetParent(const KaxCluster & aParentCluster) {ParentCluster = &aParentCluster;} - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; - filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA); + filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) override; protected: uint64 Timecode; // temporary timecode of the first frame if there are more than one diff --git a/matroska/KaxBlockData.h b/matroska/KaxBlockData.h index bd54784..c8e86b3 100644 --- a/matroska/KaxBlockData.h +++ b/matroska/KaxBlockData.h @@ -49,11 +49,11 @@ START_LIBMATROSKA_NAMESPACE */ DECLARE_MKX_SINTEGER_CONS(KaxReferenceBlock) public: - ~KaxReferenceBlock(); + ~KaxReferenceBlock() override; /*! \brief override this method to compute the timecode value */ - virtual filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false); + filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false) override; const KaxBlockBlob & RefBlock() const; void SetReferencedBlock(const KaxBlockBlob * aRefdBlock); diff --git a/matroska/KaxCues.h b/matroska/KaxCues.h index c3f214b..5bebb2f 100644 --- a/matroska/KaxCues.h +++ b/matroska/KaxCues.h @@ -49,7 +49,7 @@ class KaxCuePoint; DECLARE_MKX_MASTER(KaxCues) public: - ~KaxCues(); + ~KaxCues() override; //bool AddBlockGroup(const KaxBlockGroup & BlockReference); // deprecated bool AddBlockBlob(const KaxBlockBlob & BlockReference); diff --git a/matroska/KaxCuesData.h b/matroska/KaxCuesData.h index 56b405d..a4906fb 100644 --- a/matroska/KaxCuesData.h +++ b/matroska/KaxCuesData.h @@ -55,7 +55,7 @@ DECLARE_MKX_MASTER(KaxCuePoint) void PositionSet(const KaxSimpleBlock & BlockReference, uint64 GlobalTimecodeScale); void PositionSet(const KaxInternalBlock & BlockReference, const KaxBlockGroup *BlockGroup, uint64 GlobalTimecodeScale); - virtual bool IsSmallerThan(const EbmlElement *Cmp) const; + bool IsSmallerThan(const EbmlElement *Cmp) const override; const KaxCueTrackPositions * GetSeekPosition() const; bool Timecode(uint64 & aTimecode, uint64 GlobalTimecodeScale) const; diff --git a/matroska/KaxInfoData.h b/matroska/KaxInfoData.h index 09d17ff..b5cf66a 100644 --- a/matroska/KaxInfoData.h +++ b/matroska/KaxInfoData.h @@ -56,7 +56,7 @@ class MATROSKA_DLL_API KaxPrevUID : public KaxSegmentUID { public: KaxPrevUID(EBML_EXTRA_PARAM) = default; KaxPrevUID(const KaxPrevUID & ElementToClone) :KaxSegmentUID(ElementToClone){} - virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);} + bool ValidateSize() const override { return IsFiniteSize() && (GetSize() == 16);} EBML_CONCRETE_CLASS(KaxPrevUID) }; @@ -66,7 +66,7 @@ class MATROSKA_DLL_API KaxNextUID : public KaxSegmentUID { public: KaxNextUID(EBML_EXTRA_PARAM) = default; KaxNextUID(const KaxNextUID & ElementToClone) :KaxSegmentUID(ElementToClone){} - virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);} + bool ValidateSize() const override { return IsFiniteSize() && (GetSize() == 16);} EBML_CONCRETE_CLASS(KaxNextUID) }; diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index d4969c2..0f6ee98 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -49,7 +49,7 @@ using namespace LIBEBML_NAMESPACE; START_LIBMATROSKA_NAMESPACE DECLARE_MKX_BINARY (KaxSeekID) public: - virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() <= 4;} + bool ValidateSize() const override {return IsFiniteSize() && GetSize() <= 4;} }; DECLARE_MKX_UINTEGER(KaxSeekPosition) @@ -64,7 +64,7 @@ public: KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM); #endif public: - virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;} + bool ValidateSize() const override {return IsFiniteSize() && GetSize() == 16;} }; DECLARE_MKX_UNISTRING(KaxSegmentFilename) @@ -78,7 +78,7 @@ DECLARE_MKX_UNISTRING(KaxNextFilename) DECLARE_MKX_BINARY (KaxSegmentFamily) public: - virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;} + bool ValidateSize() const override {return IsFiniteSize() && GetSize() == 16;} }; DECLARE_MKX_MASTER(KaxChapterTranslate) @@ -146,7 +146,7 @@ DECLARE_MKX_UINTEGER(KaxReferencePriority) DECLARE_MKX_SINTEGER(KaxReferenceVirtual) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_BINARY (KaxCodecState) @@ -160,32 +160,32 @@ DECLARE_MKX_MASTER(KaxSlices) DECLARE_MKX_MASTER(KaxTimeSlice) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxSliceLaceNumber) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxSliceFrameNumber) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxSliceBlockAddID) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxSliceDelay) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxSliceDuration) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_MASTER(KaxReferenceFrame) @@ -199,7 +199,7 @@ DECLARE_MKX_UINTEGER(KaxReferenceTimeCode) DECLARE_MKX_BINARY (KaxEncryptedBlock) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_MASTER(KaxTracks) @@ -258,7 +258,7 @@ DECLARE_MKX_FLOAT(KaxTrackTimecodeScale) DECLARE_MKX_SINTEGER(KaxTrackOffset) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxMaxBlockAdditionID) @@ -299,22 +299,22 @@ DECLARE_MKX_UNISTRING(KaxCodecName) DECLARE_MKX_UINTEGER(KaxTrackAttachmentLink) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UNISTRING(KaxCodecSettings) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_STRING(KaxCodecInfoURL) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_STRING(KaxCodecDownloadURL) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxCodecDecodeAll) @@ -358,7 +358,7 @@ DECLARE_MKX_UINTEGER(KaxVideoAlphaMode) DECLARE_MKX_UINTEGER(KaxOldStereoMode) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxVideoPixelWidth) @@ -393,17 +393,17 @@ DECLARE_MKX_UINTEGER(KaxVideoAspectRatio) DECLARE_MKX_BINARY (KaxVideoColourSpace) public: - virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 4;} + bool ValidateSize() const override {return IsFiniteSize() && GetSize() == 4;} }; DECLARE_MKX_FLOAT(KaxVideoGamma) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_FLOAT(KaxVideoFrameRate) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_MASTER(KaxVideoColour) @@ -513,7 +513,7 @@ DECLARE_MKX_UINTEGER(KaxAudioChannels) DECLARE_MKX_BINARY (KaxAudioPosition) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxAudioBitDepth) @@ -545,7 +545,7 @@ DECLARE_MKX_UINTEGER(KaxTrickTrackUID) DECLARE_MKX_BINARY (KaxTrickTrackSegmentUID) public: - virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;} + bool ValidateSize() const override {return IsFiniteSize() && GetSize() == 16;} }; DECLARE_MKX_UINTEGER(KaxTrickTrackFlag) @@ -556,7 +556,7 @@ DECLARE_MKX_UINTEGER(KaxTrickMasterTrackUID) DECLARE_MKX_BINARY (KaxTrickMasterTrackSegmentUID) public: - virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;} + bool ValidateSize() const override {return IsFiniteSize() && GetSize() == 16;} }; DECLARE_MKX_MASTER(KaxContentEncodings) @@ -636,17 +636,17 @@ DECLARE_MKX_UINTEGER(KaxCueRefTime) DECLARE_MKX_UINTEGER(KaxCueRefCluster) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxCueRefNumber) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxCueRefCodecState) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_MASTER(KaxAttachments) @@ -672,17 +672,17 @@ DECLARE_MKX_UINTEGER(KaxFileUID) DECLARE_MKX_BINARY (KaxFileReferral) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxFileUsedStartTime) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_UINTEGER(KaxFileUsedEndTime) public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; }; DECLARE_MKX_MASTER(KaxChapters) @@ -726,7 +726,7 @@ DECLARE_MKX_UINTEGER(KaxChapterFlagEnabled) DECLARE_MKX_BINARY (KaxChapterSegmentUID) public: - virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;} + bool ValidateSize() const override {return IsFiniteSize() && GetSize() == 16;} }; DECLARE_MKX_UINTEGER(KaxChapterSegmentEditionUID)