diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-05 09:12:49 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-05 12:15:09 +0000 |
commit | a9789cf46b19726e201069e9d4dfee48f0570691 (patch) | |
tree | cb3d4d73ce52597e1661b8013f71367f781355ae /src/plugins/directshow/player | |
parent | 35ace9e289dcaada5e0828a59ca7dfee78a6342c (diff) |
DirectShow: Fix clang-tidy warnings about class definitions
- Use ' = default' for trivial constructors/destructors
- replace virtual by override or add override where applicable
- Replace trivial constructors by member initialization for simple structs
- Add Q_DISABLE_COPY where applicable
- Mark move assignment/move constructors as noexcept
- Remove unused member variables
Change-Id: I579fb69ebcd945b94de32b827d93e5a4dab4df97
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/directshow/player')
10 files changed, 110 insertions, 109 deletions
diff --git a/src/plugins/directshow/player/directshowaudioendpointcontrol.h b/src/plugins/directshow/player/directshowaudioendpointcontrol.h index e0e6a1545..b6f8a6724 100644 --- a/src/plugins/directshow/player/directshowaudioendpointcontrol.h +++ b/src/plugins/directshow/player/directshowaudioendpointcontrol.h @@ -53,16 +53,16 @@ class DirectShowAudioEndpointControl : public QAudioOutputSelectorControl Q_OBJECT public: DirectShowAudioEndpointControl(DirectShowPlayerService *service, QObject *parent = 0); - ~DirectShowAudioEndpointControl(); + ~DirectShowAudioEndpointControl() override; - QList<QString> availableOutputs() const; + QList<QString> availableOutputs() const override; - QString outputDescription(const QString &name) const; + QString outputDescription(const QString &name) const override; - QString defaultOutput() const; - QString activeOutput() const; + QString defaultOutput() const override; + QString activeOutput() const override; - void setActiveOutput(const QString& name); + void setActiveOutput(const QString& name) override; private: void updateEndpoints(); diff --git a/src/plugins/directshow/player/directshowioreader.h b/src/plugins/directshow/player/directshowioreader.h index 2d62c0b95..550990648 100644 --- a/src/plugins/directshow/player/directshowioreader.h +++ b/src/plugins/directshow/player/directshowioreader.h @@ -58,33 +58,34 @@ class DirectShowIOReader : public QObject, public IAsyncReader Q_OBJECT public: DirectShowIOReader(QIODevice *device, DirectShowIOSource *source, DirectShowEventLoop *loop); - ~DirectShowIOReader(); + ~DirectShowIOReader() override; // IUnknown - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject); - ULONG STDMETHODCALLTYPE AddRef(); - ULONG STDMETHODCALLTYPE Release(); + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) override; + ULONG STDMETHODCALLTYPE AddRef() override; + ULONG STDMETHODCALLTYPE Release() override; // IAsyncReader HRESULT STDMETHODCALLTYPE RequestAllocator( - IMemAllocator *pPreferred, ALLOCATOR_PROPERTIES *pProps, IMemAllocator **ppActual); + IMemAllocator *pPreferred, ALLOCATOR_PROPERTIES *pProps, + IMemAllocator **ppActual) override; - HRESULT STDMETHODCALLTYPE Request(IMediaSample *pSample, DWORD_PTR dwUser); + HRESULT STDMETHODCALLTYPE Request(IMediaSample *pSample, DWORD_PTR dwUser) override; HRESULT STDMETHODCALLTYPE WaitForNext( - DWORD dwTimeout, IMediaSample **ppSample, DWORD_PTR *pdwUser); + DWORD dwTimeout, IMediaSample **ppSample, DWORD_PTR *pdwUser) override; - HRESULT STDMETHODCALLTYPE SyncReadAligned(IMediaSample *pSample); + HRESULT STDMETHODCALLTYPE SyncReadAligned(IMediaSample *pSample) override; - HRESULT STDMETHODCALLTYPE SyncRead(LONGLONG llPosition, LONG lLength, BYTE *pBuffer); + HRESULT STDMETHODCALLTYPE SyncRead(LONGLONG llPosition, LONG lLength, BYTE *pBuffer) override; - HRESULT STDMETHODCALLTYPE Length(LONGLONG *pTotal, LONGLONG *pAvailable); + HRESULT STDMETHODCALLTYPE Length(LONGLONG *pTotal, LONGLONG *pAvailable) override; - HRESULT STDMETHODCALLTYPE BeginFlush(); - HRESULT STDMETHODCALLTYPE EndFlush(); + HRESULT STDMETHODCALLTYPE BeginFlush() override; + HRESULT STDMETHODCALLTYPE EndFlush() override; protected: - void customEvent(QEvent *event); + void customEvent(QEvent *event) override; private Q_SLOTS: void readyRead(); diff --git a/src/plugins/directshow/player/directshowiosource.h b/src/plugins/directshow/player/directshowiosource.h index 43df6c34f..02639de7c 100644 --- a/src/plugins/directshow/player/directshowiosource.h +++ b/src/plugins/directshow/player/directshowiosource.h @@ -53,6 +53,7 @@ class DirectShowIOSource , public IAMFilterMiscFlags , public IPin { + Q_DISABLE_COPY(DirectShowIOSource) public: DirectShowIOSource(DirectShowEventLoop *loop); virtual ~DirectShowIOSource(); @@ -61,60 +62,61 @@ public: void setAllocator(IMemAllocator *allocator); // IUnknown - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject); - ULONG STDMETHODCALLTYPE AddRef(); - ULONG STDMETHODCALLTYPE Release(); + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) override; + ULONG STDMETHODCALLTYPE AddRef() override; + ULONG STDMETHODCALLTYPE Release() override; // IPersist - HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); + HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID) override; // IMediaFilter - HRESULT STDMETHODCALLTYPE Run(REFERENCE_TIME tStart); - HRESULT STDMETHODCALLTYPE Pause(); - HRESULT STDMETHODCALLTYPE Stop(); + HRESULT STDMETHODCALLTYPE Run(REFERENCE_TIME tStart) override; + HRESULT STDMETHODCALLTYPE Pause() override; + HRESULT STDMETHODCALLTYPE Stop() override; - HRESULT STDMETHODCALLTYPE GetState(DWORD dwMilliSecsTimeout, FILTER_STATE *pState); + HRESULT STDMETHODCALLTYPE GetState(DWORD dwMilliSecsTimeout, FILTER_STATE *pState) override; - HRESULT STDMETHODCALLTYPE SetSyncSource(IReferenceClock *pClock); - HRESULT STDMETHODCALLTYPE GetSyncSource(IReferenceClock **ppClock); + HRESULT STDMETHODCALLTYPE SetSyncSource(IReferenceClock *pClock) override; + HRESULT STDMETHODCALLTYPE GetSyncSource(IReferenceClock **ppClock) override; // IBaseFilter - HRESULT STDMETHODCALLTYPE EnumPins(IEnumPins **ppEnum); - HRESULT STDMETHODCALLTYPE FindPin(LPCWSTR Id, IPin **ppPin); + HRESULT STDMETHODCALLTYPE EnumPins(IEnumPins **ppEnum) override; + HRESULT STDMETHODCALLTYPE FindPin(LPCWSTR Id, IPin **ppPin) override; - HRESULT STDMETHODCALLTYPE JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pName); + HRESULT STDMETHODCALLTYPE JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pName) override; - HRESULT STDMETHODCALLTYPE QueryFilterInfo(FILTER_INFO *pInfo); - HRESULT STDMETHODCALLTYPE QueryVendorInfo(LPWSTR *pVendorInfo); + HRESULT STDMETHODCALLTYPE QueryFilterInfo(FILTER_INFO *pInfo) override; + HRESULT STDMETHODCALLTYPE QueryVendorInfo(LPWSTR *pVendorInfo) override; // IAMFilterMiscFlags - ULONG STDMETHODCALLTYPE GetMiscFlags(); + ULONG STDMETHODCALLTYPE GetMiscFlags() override; // IPin - HRESULT STDMETHODCALLTYPE Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt); - HRESULT STDMETHODCALLTYPE ReceiveConnection(IPin *pConnector, const AM_MEDIA_TYPE *pmt); - HRESULT STDMETHODCALLTYPE Disconnect(); - HRESULT STDMETHODCALLTYPE ConnectedTo(IPin **ppPin); + HRESULT STDMETHODCALLTYPE Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) override; + HRESULT STDMETHODCALLTYPE ReceiveConnection(IPin *pConnector, const AM_MEDIA_TYPE *pmt) override; + HRESULT STDMETHODCALLTYPE Disconnect() override; + HRESULT STDMETHODCALLTYPE ConnectedTo(IPin **ppPin) override; - HRESULT STDMETHODCALLTYPE ConnectionMediaType(AM_MEDIA_TYPE *pmt); + HRESULT STDMETHODCALLTYPE ConnectionMediaType(AM_MEDIA_TYPE *pmt) override; - HRESULT STDMETHODCALLTYPE QueryPinInfo(PIN_INFO *pInfo); - HRESULT STDMETHODCALLTYPE QueryId(LPWSTR *Id); + HRESULT STDMETHODCALLTYPE QueryPinInfo(PIN_INFO *pInfo) override; + HRESULT STDMETHODCALLTYPE QueryId(LPWSTR *Id) override; - HRESULT STDMETHODCALLTYPE QueryAccept(const AM_MEDIA_TYPE *pmt); + HRESULT STDMETHODCALLTYPE QueryAccept(const AM_MEDIA_TYPE *pmt) override; - HRESULT STDMETHODCALLTYPE EnumMediaTypes(IEnumMediaTypes **ppEnum); + HRESULT STDMETHODCALLTYPE EnumMediaTypes(IEnumMediaTypes **ppEnum) override; - HRESULT STDMETHODCALLTYPE QueryInternalConnections(IPin **apPin, ULONG *nPin); + HRESULT STDMETHODCALLTYPE QueryInternalConnections(IPin **apPin, ULONG *nPin) override; - HRESULT STDMETHODCALLTYPE EndOfStream(); + HRESULT STDMETHODCALLTYPE EndOfStream() override; - HRESULT STDMETHODCALLTYPE BeginFlush(); - HRESULT STDMETHODCALLTYPE EndFlush(); + HRESULT STDMETHODCALLTYPE BeginFlush() override; + HRESULT STDMETHODCALLTYPE EndFlush() override; - HRESULT STDMETHODCALLTYPE NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); + HRESULT STDMETHODCALLTYPE NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, + double dRate) override; - HRESULT STDMETHODCALLTYPE QueryDirection(PIN_DIRECTION *pPinDir); + HRESULT STDMETHODCALLTYPE QueryDirection(PIN_DIRECTION *pPinDir) override; private: volatile LONG m_ref; diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp index 84f990830..c9b0f9793 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp +++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp @@ -451,9 +451,7 @@ DirectShowMetaDataControl::DirectShowMetaDataControl(QObject *parent) { } -DirectShowMetaDataControl::~DirectShowMetaDataControl() -{ -} +DirectShowMetaDataControl::~DirectShowMetaDataControl() = default; bool DirectShowMetaDataControl::isMetaDataAvailable() const { diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.h b/src/plugins/directshow/player/directshowmetadatacontrol.h index 3d2fa5e8e..ea20bf0c5 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.h +++ b/src/plugins/directshow/player/directshowmetadatacontrol.h @@ -55,19 +55,19 @@ class DirectShowMetaDataControl : public QMetaDataReaderControl Q_OBJECT public: DirectShowMetaDataControl(QObject *parent = 0); - ~DirectShowMetaDataControl(); + ~DirectShowMetaDataControl() override; - bool isMetaDataAvailable() const; + bool isMetaDataAvailable() const override; - QVariant metaData(const QString &key) const; - QStringList availableMetaData() const; + QVariant metaData(const QString &key) const override; + QStringList availableMetaData() const override; void reset(); void updateMetadata(IFilterGraph2 *graph, IBaseFilter *source, const QString &fileSrc = QString()); protected: - void customEvent(QEvent *event); + void customEvent(QEvent *event) override; private: void setMetadataAvailable(bool available); diff --git a/src/plugins/directshow/player/directshowplayercontrol.h b/src/plugins/directshow/player/directshowplayercontrol.h index fd2c21c38..dba9ab9a0 100644 --- a/src/plugins/directshow/player/directshowplayercontrol.h +++ b/src/plugins/directshow/player/directshowplayercontrol.h @@ -56,42 +56,42 @@ class DirectShowPlayerControl : public QMediaPlayerControl Q_OBJECT public: DirectShowPlayerControl(DirectShowPlayerService *service, QObject *parent = 0); - ~DirectShowPlayerControl(); + ~DirectShowPlayerControl() override; - QMediaPlayer::State state() const; + QMediaPlayer::State state() const override; - QMediaPlayer::MediaStatus mediaStatus() const; + QMediaPlayer::MediaStatus mediaStatus() const override; - qint64 duration() const; + qint64 duration() const override; - qint64 position() const; - void setPosition(qint64 position); + qint64 position() const override; + void setPosition(qint64 position) override; - int volume() const; - void setVolume(int volume); + int volume() const override; + void setVolume(int volume) override; - bool isMuted() const; - void setMuted(bool muted); + bool isMuted() const override; + void setMuted(bool muted) override; - int bufferStatus() const; + int bufferStatus() const override; - bool isAudioAvailable() const; - bool isVideoAvailable() const; + bool isAudioAvailable() const override; + bool isVideoAvailable() const override; - bool isSeekable() const; + bool isSeekable() const override; - QMediaTimeRange availablePlaybackRanges() const; + QMediaTimeRange availablePlaybackRanges() const override; - qreal playbackRate() const; - void setPlaybackRate(qreal rate); + qreal playbackRate() const override; + void setPlaybackRate(qreal rate) override; - QMediaContent media() const; - const QIODevice *mediaStream() const; - void setMedia(const QMediaContent &media, QIODevice *stream); + QMediaContent media() const override; + const QIODevice *mediaStream() const override; + void setMedia(const QMediaContent &media, QIODevice *stream) override; - void play(); - void pause(); - void stop(); + void play() override; + void pause() override; + void stop() override; void updateState(QMediaPlayer::State state); void updateStatus(QMediaPlayer::MediaStatus status); @@ -102,7 +102,7 @@ public: void updatePosition(qint64 position); protected: - void customEvent(QEvent *event); + void customEvent(QEvent *event) override; private: enum Properties diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 63635b059..6d524e71a 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -115,7 +115,7 @@ public: } protected: - void run() { m_service->run(); } + void run() override { m_service->run(); } private: DirectShowPlayerService *m_service; diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h index 01d05449e..4a9e25678 100644 --- a/src/plugins/directshow/player/directshowplayerservice.h +++ b/src/plugins/directshow/player/directshowplayerservice.h @@ -79,10 +79,10 @@ public: }; DirectShowPlayerService(QObject *parent = 0); - ~DirectShowPlayerService(); + ~DirectShowPlayerService() override; - QMediaControl* requestControl(const char *name); - void releaseControl(QMediaControl *control); + QMediaControl *requestControl(const char *name) override; + void releaseControl(QMediaControl *control) override; void load(const QMediaContent &media, QIODevice *stream); void play(); @@ -101,7 +101,7 @@ public: void setVideoOutput(IBaseFilter *filter); protected: - void customEvent(QEvent *event); + void customEvent(QEvent *event) override; private Q_SLOTS: void videoOutputChanged(); diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.h b/src/plugins/directshow/player/directshowvideorenderercontrol.h index ce515a329..b2abeeaed 100644 --- a/src/plugins/directshow/player/directshowvideorenderercontrol.h +++ b/src/plugins/directshow/player/directshowvideorenderercontrol.h @@ -59,10 +59,10 @@ class DirectShowVideoRendererControl : public QVideoRendererControl Q_OBJECT public: DirectShowVideoRendererControl(DirectShowEventLoop *loop, QObject *parent = 0); - ~DirectShowVideoRendererControl(); + ~DirectShowVideoRendererControl() override; - QAbstractVideoSurface *surface() const; - void setSurface(QAbstractVideoSurface *surface); + QAbstractVideoSurface *surface() const override; + void setSurface(QAbstractVideoSurface *surface) override; IBaseFilter *filter(); diff --git a/src/plugins/directshow/player/vmr9videowindowcontrol.h b/src/plugins/directshow/player/vmr9videowindowcontrol.h index ed3b53233..8ab9bd506 100644 --- a/src/plugins/directshow/player/vmr9videowindowcontrol.h +++ b/src/plugins/directshow/player/vmr9videowindowcontrol.h @@ -53,37 +53,37 @@ class Vmr9VideoWindowControl : public QVideoWindowControl Q_OBJECT public: Vmr9VideoWindowControl(QObject *parent = 0); - ~Vmr9VideoWindowControl(); + ~Vmr9VideoWindowControl() override; IBaseFilter *filter() const { return m_filter; } - WId winId() const; - void setWinId(WId id); + WId winId() const override; + void setWinId(WId id) override; - QRect displayRect() const; - void setDisplayRect(const QRect &rect); + QRect displayRect() const override; + void setDisplayRect(const QRect &rect) override; - bool isFullScreen() const; - void setFullScreen(bool fullScreen); + bool isFullScreen() const override; + void setFullScreen(bool fullScreen) override; - void repaint(); + void repaint() override; - QSize nativeSize() const; + QSize nativeSize() const override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; - int brightness() const; - void setBrightness(int brightness); + int brightness() const override; + void setBrightness(int brightness) override; - int contrast() const; - void setContrast(int contrast); + int contrast() const override; + void setContrast(int contrast) override; - int hue() const; - void setHue(int hue); + int hue() const override; + void setHue(int hue) override; - int saturation() const; - void setSaturation(int saturation); + int saturation() const override; + void setSaturation(int saturation) override; private: void setProcAmpValues(); |