summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-04-19 11:00:01 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-04-25 06:01:33 +0000
commit08dd127bd7c3900bdb9c73d646a12aae2383a9fb (patch)
tree632f83da2a6c28bd56b8b5100083c00128bbcc15
parent20e93ad5969d3dff85f0ef9e16830aee337ca075 (diff)
downloadqtmultimedia-08dd127bd7c3900bdb9c73d646a12aae2383a9fb.tar.gz
DirectShow: Add override
Silence the clang-cl build. Task-number: QTBUG-63512 Change-Id: I701998d63a54b556b32fa0100bf43ef3071e598b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/plugins/directshow/common/directshowbasefilter.h2
-rw-r--r--src/plugins/directshow/common/directshowmediatypeenum.h8
-rw-r--r--src/plugins/directshow/common/directshowpin.h10
-rw-r--r--src/plugins/directshow/common/directshowpinenum.h8
-rw-r--r--src/plugins/directshow/player/videosurfacefilter.cpp18
-rw-r--r--src/plugins/directshow/player/videosurfacefilter.h14
6 files changed, 30 insertions, 30 deletions
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)
diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp
index 0b1c97a74..c521a251b 100644
--- a/src/plugins/directshow/player/videosurfacefilter.cpp
+++ b/src/plugins/directshow/player/videosurfacefilter.cpp
@@ -68,19 +68,19 @@ public:
bool isMediaTypeSupported(const AM_MEDIA_TYPE *type) override;
bool setMediaType(const AM_MEDIA_TYPE *type) override;
- HRESULT completeConnection(IPin *pin);
- HRESULT connectionEnded();
+ HRESULT completeConnection(IPin *pin) override;
+ HRESULT connectionEnded() override;
// IPin
- STDMETHODIMP ReceiveConnection(IPin *pConnector, const AM_MEDIA_TYPE *pmt);
- STDMETHODIMP Disconnect();
- STDMETHODIMP EndOfStream();
- STDMETHODIMP BeginFlush();
- STDMETHODIMP EndFlush();
+ STDMETHODIMP ReceiveConnection(IPin *pConnector, const AM_MEDIA_TYPE *pmt) override;
+ STDMETHODIMP Disconnect() override;
+ STDMETHODIMP EndOfStream() override;
+ STDMETHODIMP BeginFlush() override;
+ STDMETHODIMP EndFlush() override;
// IMemInputPin
- STDMETHODIMP GetAllocatorRequirements(ALLOCATOR_PROPERTIES *pProps);
- STDMETHODIMP Receive(IMediaSample *pMediaSample);
+ STDMETHODIMP GetAllocatorRequirements(ALLOCATOR_PROPERTIES *pProps) override;
+ STDMETHODIMP Receive(IMediaSample *pMediaSample) override;
private:
VideoSurfaceFilter *m_videoSurfaceFilter;
diff --git a/src/plugins/directshow/player/videosurfacefilter.h b/src/plugins/directshow/player/videosurfacefilter.h
index 43f8cc534..56791f270 100644
--- a/src/plugins/directshow/player/videosurfacefilter.h
+++ b/src/plugins/directshow/player/videosurfacefilter.h
@@ -68,18 +68,18 @@ public:
STDMETHODIMP QueryInterface(REFIID riid, void **ppv) override;
// DirectShowBaseFilter
- QList<DirectShowPin *> pins();
+ QList<DirectShowPin *> pins() override;
// IPersist
- STDMETHODIMP GetClassID(CLSID *pClassID);
+ STDMETHODIMP GetClassID(CLSID *pClassID) override;
// IMediaFilter
- STDMETHODIMP Run(REFERENCE_TIME tStart);
- STDMETHODIMP Pause();
- STDMETHODIMP Stop();
+ STDMETHODIMP Run(REFERENCE_TIME tStart) override;
+ STDMETHODIMP Pause() override;
+ STDMETHODIMP Stop() override;
// IAMFilterMiscFlags
- STDMETHODIMP_(ULONG) GetMiscFlags();
+ STDMETHODIMP_(ULONG) GetMiscFlags() override;
// DirectShowPin (delegate)
bool isMediaTypeSupported(const AM_MEDIA_TYPE *type);
@@ -108,7 +108,7 @@ private:
RenderSample = QEvent::User + 4
};
- bool event(QEvent *);
+ bool event(QEvent *) override;
bool startSurface();
void stopSurface();