From 08dd127bd7c3900bdb9c73d646a12aae2383a9fb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 19 Apr 2018 11:00:01 +0200 Subject: DirectShow: Add override Silence the clang-cl build. Task-number: QTBUG-63512 Change-Id: I701998d63a54b556b32fa0100bf43ef3071e598b Reviewed-by: Joerg Bornemann --- src/plugins/directshow/common/directshowbasefilter.h | 2 +- src/plugins/directshow/common/directshowmediatypeenum.h | 8 ++++---- src/plugins/directshow/common/directshowpin.h | 10 +++++----- src/plugins/directshow/common/directshowpinenum.h | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/plugins/directshow/common') diff --git a/src/plugins/directshow/common/directshowbasefilter.h b/src/plugins/directshow/common/directshowbasefilter.h index 47a390d26..21ca648eb 100644 --- a/src/plugins/directshow/common/directshowbasefilter.h +++ b/src/plugins/directshow/common/directshowbasefilter.h @@ -48,7 +48,7 @@ class DirectShowBaseFilter : public IBaseFilter { public: DirectShowBaseFilter(); - virtual ~DirectShowBaseFilter(); + ~DirectShowBaseFilter(); FILTER_STATE state() const { return m_state; } HRESULT NotifyEvent(long eventCode, LONG_PTR eventParam1, LONG_PTR eventParam2); diff --git a/src/plugins/directshow/common/directshowmediatypeenum.h b/src/plugins/directshow/common/directshowmediatypeenum.h index ee2568338..e78e0a0f2 100644 --- a/src/plugins/directshow/common/directshowmediatypeenum.h +++ b/src/plugins/directshow/common/directshowmediatypeenum.h @@ -59,10 +59,10 @@ public: STDMETHODIMP QueryInterface(REFIID riid, void **ppv) override; // IEnumMediaTypes - STDMETHODIMP Next(ULONG cMediaTypes, AM_MEDIA_TYPE **ppMediaTypes, ULONG *pcFetched); - STDMETHODIMP Skip(ULONG cMediaTypes); - STDMETHODIMP Reset(); - STDMETHODIMP Clone(IEnumMediaTypes **ppEnum); + STDMETHODIMP Next(ULONG cMediaTypes, AM_MEDIA_TYPE **ppMediaTypes, ULONG *pcFetched) override; + STDMETHODIMP Skip(ULONG cMediaTypes) override; + STDMETHODIMP Reset() override; + STDMETHODIMP Clone(IEnumMediaTypes **ppEnum) override; private: Q_DISABLE_COPY(DirectShowMediaTypeEnum) diff --git a/src/plugins/directshow/common/directshowpin.h b/src/plugins/directshow/common/directshowpin.h index ee2cbc58d..9598cf525 100644 --- a/src/plugins/directshow/common/directshowpin.h +++ b/src/plugins/directshow/common/directshowpin.h @@ -115,15 +115,15 @@ private: class DirectShowOutputPin : public DirectShowPin { public: - virtual ~DirectShowOutputPin(); + ~DirectShowOutputPin() override; // DirectShowPin - virtual HRESULT completeConnection(IPin *pin); - virtual HRESULT connectionEnded(); - virtual HRESULT setActive(bool active); + HRESULT completeConnection(IPin *pin) override; + HRESULT connectionEnded() override; + HRESULT setActive(bool active) override; // IPin - STDMETHODIMP EndOfStream(); + STDMETHODIMP EndOfStream() override; protected: DirectShowOutputPin(DirectShowBaseFilter *filter, const QString &name); diff --git a/src/plugins/directshow/common/directshowpinenum.h b/src/plugins/directshow/common/directshowpinenum.h index e1baa00c2..d89f140b1 100644 --- a/src/plugins/directshow/common/directshowpinenum.h +++ b/src/plugins/directshow/common/directshowpinenum.h @@ -60,10 +60,10 @@ public: STDMETHODIMP QueryInterface(REFIID riid, void **ppv) override; // IEnumPins - STDMETHODIMP Next(ULONG cPins, IPin **ppPins, ULONG *pcFetched); - STDMETHODIMP Skip(ULONG cPins); - STDMETHODIMP Reset(); - STDMETHODIMP Clone(IEnumPins **ppEnum); + STDMETHODIMP Next(ULONG cPins, IPin **ppPins, ULONG *pcFetched) override; + STDMETHODIMP Skip(ULONG cPins) override; + STDMETHODIMP Reset() override; + STDMETHODIMP Clone(IEnumPins **ppEnum) override; private: Q_DISABLE_COPY(DirectShowPinEnum) -- cgit v1.2.3