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>

38 files changed, 289 insertions, 315 deletions

diff --git a/src/plugins/common/evr/evrcustompresenter.cpp b/src/plugins/common/evr/evrcustompresenter.cpp
index b07dbe719..d5d9df14f 100644
--- a/src/plugins/common/evr/evrcustompresenter.cpp
+++ b/src/plugins/common/evr/evrcustompresenter.cpp
@@ -98,7 +98,7 @@ public:
             m_sample->AddRef();
     }
 
-    ~PresentSampleEvent()
+    ~PresentSampleEvent() override
     {
         if (m_sample)
             m_sample->Release();
diff --git a/src/plugins/common/evr/evrcustompresenter.h b/src/plugins/common/evr/evrcustompresenter.h
index 199dee774..bd04bd952 100644
--- a/src/plugins/common/evr/evrcustompresenter.h
+++ b/src/plugins/common/evr/evrcustompresenter.h
@@ -58,6 +58,7 @@ class QAbstractVideoSurface;
 template<class T>
 class AsyncCallback : public IMFAsyncCallback
 {
+    Q_DISABLE_COPY(AsyncCallback)
 public:
     typedef HRESULT (T::*InvokeFn)(IMFAsyncResult *asyncResult);
 
@@ -66,7 +67,7 @@ public:
     }
 
     // IUnknown
-    STDMETHODIMP QueryInterface(REFIID iid, void** ppv)
+    STDMETHODIMP QueryInterface(REFIID iid, void** ppv) override
     {
         if (!ppv)
             return E_POINTER;
@@ -83,23 +84,23 @@ public:
         return S_OK;
     }
 
-    STDMETHODIMP_(ULONG) AddRef() {
+    STDMETHODIMP_(ULONG) AddRef() override {
         // Delegate to parent class.
         return m_parent->AddRef();
     }
-    STDMETHODIMP_(ULONG) Release() {
+    STDMETHODIMP_(ULONG) Release() override {
         // Delegate to parent class.
         return m_parent->Release();
     }
 
     // IMFAsyncCallback methods
-    STDMETHODIMP GetParameters(DWORD*, DWORD*)
+    STDMETHODIMP GetParameters(DWORD*, DWORD*) override
     {
         // Implementation of this method is optional.
         return E_NOTIMPL;
     }
 
-    STDMETHODIMP Invoke(IMFAsyncResult* asyncResult)
+    STDMETHODIMP Invoke(IMFAsyncResult* asyncResult) override
     {
         return (m_parent->*m_invokeFn)(asyncResult);
     }
@@ -110,6 +111,7 @@ public:
 
 class Scheduler
 {
+    Q_DISABLE_COPY(Scheduler)
 public:
     enum ScheduleEvent
     {
@@ -164,6 +166,7 @@ private:
 
 class SamplePool
 {
+    Q_DISABLE_COPY(SamplePool)
 public:
     SamplePool();
     ~SamplePool();
@@ -188,6 +191,7 @@ class EVRCustomPresenter
         , public IMFGetService
         , public IMFTopologyServiceLookupClient
 {
+    Q_DISABLE_COPY(EVRCustomPresenter)
 public:
     // Defines the state of the presenter.
     enum RenderState
@@ -216,40 +220,40 @@ public:
     };
 
     EVRCustomPresenter(QAbstractVideoSurface *surface = 0);
-    ~EVRCustomPresenter();
+    ~EVRCustomPresenter() override;
 
     bool isValid() const;
 
     // IUnknown methods
-    STDMETHODIMP QueryInterface(REFIID riid, void ** ppv);
-    STDMETHODIMP_(ULONG) AddRef();
-    STDMETHODIMP_(ULONG) Release();
+    STDMETHODIMP QueryInterface(REFIID riid, void ** ppv) override;
+    STDMETHODIMP_(ULONG) AddRef() override;
+    STDMETHODIMP_(ULONG) Release() override;
 
     // IMFGetService methods
-    STDMETHODIMP GetService(REFGUID guidService, REFIID riid, LPVOID *ppvObject);
+    STDMETHODIMP GetService(REFGUID guidService, REFIID riid, LPVOID *ppvObject) override;
 
     // IMFVideoPresenter methods
-    STDMETHODIMP ProcessMessage(MFVP_MESSAGE_TYPE message, ULONG_PTR param);
-    STDMETHODIMP GetCurrentMediaType(IMFVideoMediaType** mediaType);
+    STDMETHODIMP ProcessMessage(MFVP_MESSAGE_TYPE message, ULONG_PTR param) override;
+    STDMETHODIMP GetCurrentMediaType(IMFVideoMediaType** mediaType) override;
 
     // IMFClockStateSink methods
-    STDMETHODIMP OnClockStart(MFTIME systemTime, LONGLONG clockStartOffset);
-    STDMETHODIMP OnClockStop(MFTIME systemTime);
-    STDMETHODIMP OnClockPause(MFTIME systemTime);
-    STDMETHODIMP OnClockRestart(MFTIME systemTime);
-    STDMETHODIMP OnClockSetRate(MFTIME systemTime, float rate);
+    STDMETHODIMP OnClockStart(MFTIME systemTime, LONGLONG clockStartOffset) override;
+    STDMETHODIMP OnClockStop(MFTIME systemTime) override;
+    STDMETHODIMP OnClockPause(MFTIME systemTime) override;
+    STDMETHODIMP OnClockRestart(MFTIME systemTime) override;
+    STDMETHODIMP OnClockSetRate(MFTIME systemTime, float rate) override;
 
     // IMFRateSupport methods
-    STDMETHODIMP GetSlowestRate(MFRATE_DIRECTION direction, BOOL thin, float *rate);
-    STDMETHODIMP GetFastestRate(MFRATE_DIRECTION direction, BOOL thin, float *rate);
-    STDMETHODIMP IsRateSupported(BOOL thin, float rate, float *nearestSupportedRate);
+    STDMETHODIMP GetSlowestRate(MFRATE_DIRECTION direction, BOOL thin, float *rate) override;
+    STDMETHODIMP GetFastestRate(MFRATE_DIRECTION direction, BOOL thin, float *rate) override;
+    STDMETHODIMP IsRateSupported(BOOL thin, float rate, float *nearestSupportedRate) override;
 
     // IMFVideoDeviceID methods
-    STDMETHODIMP GetDeviceID(IID* deviceID);
+    STDMETHODIMP GetDeviceID(IID* deviceID) override;
 
     // IMFTopologyServiceLookupClient methods
-    STDMETHODIMP InitServicePointers(IMFTopologyServiceLookup *lookup);
-    STDMETHODIMP ReleaseServicePointers();
+    STDMETHODIMP InitServicePointers(IMFTopologyServiceLookup *lookup) override;
+    STDMETHODIMP ReleaseServicePointers() override;
 
     void supportedFormatsChanged();
     void setSurface(QAbstractVideoSurface *surface);
@@ -258,7 +262,7 @@ public:
     void stopSurface();
     void presentSample(IMFSample *sample);
 
-    bool event(QEvent *);
+    bool event(QEvent *) override;
 
 private:
     HRESULT checkShutdown() const
@@ -324,17 +328,10 @@ private:
     // Holds information related to frame-stepping.
     struct FrameStep
     {
-        FrameStep()
-            : state(FrameStepNone)
-            , steps(0)
-            , sampleNoRef(0)
-        {
-        }
-
-        FrameStepState state;
+        FrameStepState state = FrameStepNone;
         QList<IMFSample*> samples;
-        DWORD steps;
-        DWORD_PTR sampleNoRef;
+        DWORD steps = 0;
+        DWORD_PTR sampleNoRef = 0;
     };
 
     long m_refCount;
diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/plugins/common/evr/evrd3dpresentengine.cpp
index 54403faba..12b907336 100644
--- a/src/plugins/common/evr/evrd3dpresentengine.cpp
+++ b/src/plugins/common/evr/evrd3dpresentengine.cpp
@@ -204,7 +204,7 @@ private:
     unsigned int m_glTexture;
     QOpenGLContext *m_glContext;
 
-    ~OpenGLResources()
+    ~OpenGLResources() override
     {
         QScopedPointer<QOffscreenSurface> surface;
         if (m_glContext != QOpenGLContext::currentContext()) {
@@ -254,7 +254,7 @@ public:
         }
     }
 
-    ~IMFSampleVideoBuffer()
+    ~IMFSampleVideoBuffer() override
     {
         if (m_surface) {
             if (m_mapMode != NotMapped)
@@ -265,11 +265,11 @@ public:
             m_sample->Release();
     }
 
-    QVariant handle() const;
+    QVariant handle() const override;
 
-    MapMode mapMode() const { return m_mapMode; }
-    uchar *map(MapMode, int*, int*);
-    void unmap();
+    MapMode mapMode() const override { return m_mapMode; }
+    uchar *map(MapMode, int*, int*) override;
+    void unmap() override;
 
 private:
     mutable D3DPresentEngine *m_engine;
diff --git a/src/plugins/common/evr/evrd3dpresentengine.h b/src/plugins/common/evr/evrd3dpresentengine.h
index 18a7409fa..df2c9b506 100644
--- a/src/plugins/common/evr/evrd3dpresentengine.h
+++ b/src/plugins/common/evr/evrd3dpresentengine.h
@@ -72,6 +72,7 @@ class OpenGLResources;
 
 class EGLWrapper
 {
+    Q_DISABLE_COPY(EGLWrapper)
 public:
     EGLWrapper();
 
@@ -99,6 +100,7 @@ private:
 
 class D3DPresentEngine
 {
+    Q_DISABLE_COPY(D3DPresentEngine)
 public:
     enum Hint
     {
diff --git a/src/plugins/common/evr/evrvideowindowcontrol.h b/src/plugins/common/evr/evrvideowindowcontrol.h
index fcfe20958..ce3b7746f 100644
--- a/src/plugins/common/evr/evrvideowindowcontrol.h
+++ b/src/plugins/common/evr/evrvideowindowcontrol.h
@@ -51,37 +51,37 @@ class EvrVideoWindowControl : public QVideoWindowControl
     Q_OBJECT
 public:
     EvrVideoWindowControl(QObject *parent = 0);
-    ~EvrVideoWindowControl();
+    ~EvrVideoWindowControl() override;
 
     bool setEvr(IUnknown *evr);
 
-    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;
 
     void applyImageControls();
 
diff --git a/src/plugins/directshow/camera/dscameracontrol.cpp b/src/plugins/directshow/camera/dscameracontrol.cpp
index 7a2b46a2c..8dc0d4136 100644
--- a/src/plugins/directshow/camera/dscameracontrol.cpp
+++ b/src/plugins/directshow/camera/dscameracontrol.cpp
@@ -61,9 +61,7 @@ DSCameraControl::DSCameraControl(QObject *parent)
             this, &DSCameraControl::error);
 }
 
-DSCameraControl::~DSCameraControl()
-{
-}
+DSCameraControl::~DSCameraControl() = default;
 
 void DSCameraControl::setState(QCamera::State state)
 {
diff --git a/src/plugins/directshow/camera/dscameracontrol.h b/src/plugins/directshow/camera/dscameracontrol.h
index 2f50db560..b9fb2766d 100644
--- a/src/plugins/directshow/camera/dscameracontrol.h
+++ b/src/plugins/directshow/camera/dscameracontrol.h
@@ -45,7 +45,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class DSCameraService;
 class DSCameraSession;
 
 
@@ -54,22 +53,22 @@ class DSCameraControl : public QCameraControl
     Q_OBJECT
 public:
     DSCameraControl(QObject *parent = 0);
-    ~DSCameraControl();
+    ~DSCameraControl() override;
 
-    QCamera::State state() const { return m_state; }
+    QCamera::State state() const override { return m_state; }
 
-    QCamera::CaptureModes captureMode() const { return m_captureMode; }
-    void setCaptureMode(QCamera::CaptureModes mode);
+    QCamera::CaptureModes captureMode() const override { return m_captureMode; }
+    void setCaptureMode(QCamera::CaptureModes mode) override;
 
-    void setState(QCamera::State state);
+    void setState(QCamera::State state) override;
 
-    QCamera::Status status() const;
-    bool isCaptureModeSupported(QCamera::CaptureModes mode) const;
-    bool canChangeProperty(PropertyChangeType /* changeType */, QCamera::Status /* status */) const {return false; }
+    QCamera::Status status() const override;
+    bool isCaptureModeSupported(QCamera::CaptureModes mode) const override;
+    bool canChangeProperty(PropertyChangeType, QCamera::Status) const override
+    { return false; }
 
 private:
     DSCameraSession *m_session;
-    DSCameraService *m_service;
     QCamera::State m_state;
     QCamera::CaptureModes m_captureMode;
 };
diff --git a/src/plugins/directshow/camera/dscameraimageprocessingcontrol.cpp b/src/plugins/directshow/camera/dscameraimageprocessingcontrol.cpp
index cbecb8b86..6d0f45ae9 100644
--- a/src/plugins/directshow/camera/dscameraimageprocessingcontrol.cpp
+++ b/src/plugins/directshow/camera/dscameraimageprocessingcontrol.cpp
@@ -48,9 +48,7 @@ DSCameraImageProcessingControl::DSCameraImageProcessingControl(DSCameraSession *
 {
 }
 
-DSCameraImageProcessingControl::~DSCameraImageProcessingControl()
-{
-}
+DSCameraImageProcessingControl::~DSCameraImageProcessingControl() = default;
 
 bool DSCameraImageProcessingControl::isParameterSupported(
         QCameraImageProcessingControl::ProcessingParameter parameter) const
diff --git a/src/plugins/directshow/camera/dscameraimageprocessingcontrol.h b/src/plugins/directshow/camera/dscameraimageprocessingcontrol.h
index 86ecce720..48f1b6b2c 100644
--- a/src/plugins/directshow/camera/dscameraimageprocessingcontrol.h
+++ b/src/plugins/directshow/camera/dscameraimageprocessingcontrol.h
@@ -53,12 +53,13 @@ class DSCameraImageProcessingControl : public QCameraImageProcessingControl
 
 public:
     DSCameraImageProcessingControl(DSCameraSession *session);
-    virtual ~DSCameraImageProcessingControl();
+     ~DSCameraImageProcessingControl() override;
 
-    bool isParameterSupported(ProcessingParameter) const;
-    bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const;
-    QVariant parameter(ProcessingParameter parameter) const;
-    void setParameter(ProcessingParameter parameter, const QVariant &value);
+    bool isParameterSupported(ProcessingParameter) const override;
+    bool isParameterValueSupported(ProcessingParameter parameter,
+                                   const QVariant &value) const override;
+    QVariant parameter(ProcessingParameter parameter) const override;
+    void setParameter(ProcessingParameter parameter, const QVariant &value) override;
 
 private:
     DSCameraSession *m_session;
diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h
index f444eeb51..2e45edcce 100644
--- a/src/plugins/directshow/camera/dscameraservice.h
+++ b/src/plugins/directshow/camera/dscameraservice.h
@@ -64,10 +64,10 @@ class DSCameraService : public QMediaService
 
 public:
     DSCameraService(QObject *parent = 0);
-    ~DSCameraService();
+    ~DSCameraService() override;
 
-    virtual QMediaControl* requestControl(const char *name);
-    virtual void releaseControl(QMediaControl *control);
+    QMediaControl* requestControl(const char *name) override;
+    void releaseControl(QMediaControl *control) override;
 
 private:
     DSCameraSession        *m_session;
diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h
index 433db8994..ac861ae58 100644
--- a/src/plugins/directshow/camera/dscamerasession.h
+++ b/src/plugins/directshow/camera/dscamerasession.h
@@ -84,7 +84,7 @@ class DSCameraSession : public QObject
     Q_OBJECT
 public:
     DSCameraSession(QObject *parent = 0);
-    ~DSCameraSession();
+    ~DSCameraSession() override;
 
     QCamera::Status status() const { return m_status; }
 
@@ -145,25 +145,15 @@ private Q_SLOTS:
     void updateReadyForCapture();
 
 private:
-    struct ImageProcessingParameterInfo {
-        ImageProcessingParameterInfo()
-            : minimumValue(0)
-            , maximumValue(0)
-            , defaultValue(0)
-            , currentValue(0)
-            , capsFlags(0)
-            , hasBeenExplicitlySet(false)
-            , videoProcAmpProperty(VideoProcAmp_Brightness)
-        {
-        }
-
-        LONG minimumValue;
-        LONG maximumValue;
-        LONG defaultValue;
-        LONG currentValue;
-        LONG capsFlags;
-        bool hasBeenExplicitlySet;
-        VideoProcAmpProperty videoProcAmpProperty;
+    struct ImageProcessingParameterInfo
+    {
+        LONG minimumValue = 0;
+        LONG maximumValue = 0;
+        LONG defaultValue = 0;
+        LONG currentValue = 0;
+        LONG capsFlags = 0;
+        bool hasBeenExplicitlySet = false;
+        VideoProcAmpProperty videoProcAmpProperty = VideoProcAmp_Brightness;
     };
 
     void setStatus(QCamera::Status status);
diff --git a/src/plugins/directshow/camera/dscameraviewfindersettingscontrol.h b/src/plugins/directshow/camera/dscameraviewfindersettingscontrol.h
index 5ab3c2d93..a2b646edf 100644
--- a/src/plugins/directshow/camera/dscameraviewfindersettingscontrol.h
+++ b/src/plugins/directshow/camera/dscameraviewfindersettingscontrol.h
@@ -51,10 +51,10 @@ class DSCameraViewfinderSettingsControl : public QCameraViewfinderSettingsContro
 public:
     DSCameraViewfinderSettingsControl(DSCameraSession *session);
 
-    QList<QCameraViewfinderSettings> supportedViewfinderSettings() const;
+    QList<QCameraViewfinderSettings> supportedViewfinderSettings() const override;
 
-    QCameraViewfinderSettings viewfinderSettings() const;
-    void setViewfinderSettings(const QCameraViewfinderSettings &settings);
+    QCameraViewfinderSettings viewfinderSettings() const override;
+    void setViewfinderSettings(const QCameraViewfinderSettings &settings) override;
 
 private:
     DSCameraSession *m_session;
diff --git a/src/plugins/directshow/camera/dsimagecapturecontrol.cpp b/src/plugins/directshow/camera/dsimagecapturecontrol.cpp
index c92ce98e1..2a6a794d5 100644
--- a/src/plugins/directshow/camera/dsimagecapturecontrol.cpp
+++ b/src/plugins/directshow/camera/dsimagecapturecontrol.cpp
@@ -61,9 +61,7 @@ DSImageCaptureControl::DSImageCaptureControl(DSCameraSession *session)
             this, &DSImageCaptureControl::imageAvailable);
 }
 
-DSImageCaptureControl::~DSImageCaptureControl()
-{
-}
+DSImageCaptureControl::~DSImageCaptureControl() = default;
 
 bool DSImageCaptureControl::isReadyForCapture() const
 {
diff --git a/src/plugins/directshow/camera/dsimagecapturecontrol.h b/src/plugins/directshow/camera/dsimagecapturecontrol.h
index 38b832dc4..c619de1a1 100644
--- a/src/plugins/directshow/camera/dsimagecapturecontrol.h
+++ b/src/plugins/directshow/camera/dsimagecapturecontrol.h
@@ -50,15 +50,15 @@ class DSImageCaptureControl : public QCameraImageCaptureControl
     Q_OBJECT
 public:
     DSImageCaptureControl(DSCameraSession *session);
-    ~DSImageCaptureControl();
+    ~DSImageCaptureControl() override;
 
-    bool isReadyForCapture() const;
-    int capture(const QString &fileName);
+    bool isReadyForCapture() const override;
+    int capture(const QString &fileName) override;
 
-    QCameraImageCapture::DriveMode driveMode() const;
-    void setDriveMode(QCameraImageCapture::DriveMode mode);
+    QCameraImageCapture::DriveMode driveMode() const override;
+    void setDriveMode(QCameraImageCapture::DriveMode mode) override;
 
-    void cancelCapture() {}
+    void cancelCapture() override {}
 
 private:
     DSCameraSession *m_session;
diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.h b/src/plugins/directshow/camera/dsvideodevicecontrol.h
index 09f46aff0..7a7a0af1e 100644
--- a/src/plugins/directshow/camera/dsvideodevicecontrol.h
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.h
@@ -56,16 +56,16 @@ class DSVideoDeviceControl : public QVideoDeviceSelectorControl
 public:
     DSVideoDeviceControl(QObject *parent = 0);
 
-    int deviceCount() const;
-    QString deviceName(int index) const;
-    QString deviceDescription(int index) const;
-    int defaultDevice() const;
-    int selectedDevice() const;
+    int deviceCount() const override;
+    QString deviceName(int index) const override;
+    QString deviceDescription(int index) const override;
+    int defaultDevice() const override;
+    int selectedDevice() const override;
 
     static const QList<DSVideoDeviceInfo> &availableDevices();
 
 public Q_SLOTS:
-    void setSelectedDevice(int index);
+    void setSelectedDevice(int index) override;
 
 private:
     static void updateDevices();
diff --git a/src/plugins/directshow/camera/dsvideorenderer.cpp b/src/plugins/directshow/camera/dsvideorenderer.cpp
index 4eacb5456..bf0aa2684 100644
--- a/src/plugins/directshow/camera/dsvideorenderer.cpp
+++ b/src/plugins/directshow/camera/dsvideorenderer.cpp
@@ -50,9 +50,7 @@ DSVideoRendererControl::DSVideoRendererControl(DSCameraSession* session, QObject
 {
 }
 
-DSVideoRendererControl::~DSVideoRendererControl()
-{
-}
+DSVideoRendererControl::~DSVideoRendererControl() = default;
 
 QAbstractVideoSurface* DSVideoRendererControl::surface() const
 {
diff --git a/src/plugins/directshow/camera/dsvideorenderer.h b/src/plugins/directshow/camera/dsvideorenderer.h
index 7618f0ca6..3a4570b4c 100644
--- a/src/plugins/directshow/camera/dsvideorenderer.h
+++ b/src/plugins/directshow/camera/dsvideorenderer.h
@@ -43,8 +43,6 @@
 #include <qvideorenderercontrol.h>
 #include "dscamerasession.h"
 
-class CameraFormatConverter;
-
 QT_BEGIN_NAMESPACE
 
 
@@ -53,17 +51,16 @@ class DSVideoRendererControl : public QVideoRendererControl
     Q_OBJECT
 public:
     DSVideoRendererControl(DSCameraSession* session, QObject *parent = 0);
-    ~DSVideoRendererControl();
+    ~DSVideoRendererControl() override;
 
-    QAbstractVideoSurface *surface() const;
-    void setSurface(QAbstractVideoSurface *surface);
+    QAbstractVideoSurface *surface() const override;
+    void setSurface(QAbstractVideoSurface *surface) override;
 
     void setSession(DSCameraSession* session);
 
 private:
     QAbstractVideoSurface* m_surface;
     DSCameraSession* m_session;
-    CameraFormatConverter* converter;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/directshow/common/directshowaudioprobecontrol.h b/src/plugins/directshow/common/directshowaudioprobecontrol.h
index 553bd1178..034e958fd 100644
--- a/src/plugins/directshow/common/directshowaudioprobecontrol.h
+++ b/src/plugins/directshow/common/directshowaudioprobecontrol.h
@@ -51,7 +51,7 @@ class DirectShowAudioProbeControl : public QMediaAudioProbeControl
     Q_OBJECT
 public:
     explicit DirectShowAudioProbeControl(QObject *p = nullptr);
-    ~DirectShowAudioProbeControl();
+    ~DirectShowAudioProbeControl() override;
 
     bool ref() { return m_ref.ref(); }
     bool deref() { return m_ref.deref(); }
diff --git a/src/plugins/directshow/common/directshowbasefilter.h b/src/plugins/directshow/common/directshowbasefilter.h
index 21ca648eb..fe78f96b2 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();
-    ~DirectShowBaseFilter();
+    virtual ~DirectShowBaseFilter();
 
     FILTER_STATE state() const { return m_state; }
     HRESULT NotifyEvent(long eventCode, LONG_PTR eventParam1, LONG_PTR eventParam2);
@@ -56,26 +56,26 @@ public:
     virtual QList<DirectShowPin *> pins() = 0;
 
     // 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;
 
-    STDMETHODIMP GetState(DWORD dwMilliSecsTimeout, FILTER_STATE *pState);
+    STDMETHODIMP GetState(DWORD dwMilliSecsTimeout, FILTER_STATE *pState) override;
 
-    STDMETHODIMP SetSyncSource(IReferenceClock *pClock);
-    STDMETHODIMP GetSyncSource(IReferenceClock **ppClock);
+    STDMETHODIMP SetSyncSource(IReferenceClock *pClock) override;
+    STDMETHODIMP GetSyncSource(IReferenceClock **ppClock) override;
 
     // IBaseFilter
-    STDMETHODIMP EnumPins(IEnumPins **ppEnum);
-    STDMETHODIMP FindPin(LPCWSTR Id, IPin **ppPin);
+    STDMETHODIMP EnumPins(IEnumPins **ppEnum) override;
+    STDMETHODIMP FindPin(LPCWSTR Id, IPin **ppPin) override;
 
-    STDMETHODIMP JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pName);
+    STDMETHODIMP JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pName) override;
 
-    STDMETHODIMP QueryFilterInfo(FILTER_INFO *pInfo);
-    STDMETHODIMP QueryVendorInfo(LPWSTR *pVendorInfo);
+    STDMETHODIMP QueryFilterInfo(FILTER_INFO *pInfo) override;
+    STDMETHODIMP QueryVendorInfo(LPWSTR *pVendorInfo) override;
 
 protected:
     QMutex m_mutex;
diff --git a/src/plugins/directshow/common/directshoweventloop.cpp b/src/plugins/directshow/common/directshoweventloop.cpp
index ef85c0429..fbc7b8cee 100644
--- a/src/plugins/directshow/common/directshoweventloop.cpp
+++ b/src/plugins/directshow/common/directshoweventloop.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class DirectShowPostedEvent
 {
+    Q_DISABLE_COPY(DirectShowPostedEvent)
 public:
     DirectShowPostedEvent(QObject *receiver, QEvent *event)
         : receiver(receiver)
diff --git a/src/plugins/directshow/common/directshoweventloop.h b/src/plugins/directshow/common/directshoweventloop.h
index 609e53134..a29274b7b 100644
--- a/src/plugins/directshow/common/directshoweventloop.h
+++ b/src/plugins/directshow/common/directshoweventloop.h
@@ -55,7 +55,7 @@ class DirectShowEventLoop : public QObject
     Q_OBJECT
 public:
     DirectShowEventLoop(QObject *parent = 0);
-    ~DirectShowEventLoop();
+    ~DirectShowEventLoop() override;
 
     void wait(QMutex *mutex);
     void wake();
@@ -63,7 +63,7 @@ public:
     void postEvent(QObject *object, QEvent *event);
 
 protected:
-    void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;
 
 private:
     void processEvents();
diff --git a/src/plugins/directshow/common/directshowmediatype.cpp b/src/plugins/directshow/common/directshowmediatype.cpp
index 65882806c..b2a514609 100644
--- a/src/plugins/directshow/common/directshowmediatype.cpp
+++ b/src/plugins/directshow/common/directshowmediatype.cpp
@@ -98,7 +98,7 @@ DirectShowMediaType::DirectShowMediaType(const DirectShowMediaType &other)
     copy(&mediaType, &other.mediaType);
 }
 
-DirectShowMediaType::DirectShowMediaType(DirectShowMediaType &&other)
+DirectShowMediaType::DirectShowMediaType(DirectShowMediaType &&other) noexcept
     : DirectShowMediaType()
 {
     move(&mediaType, other.mediaType);
@@ -110,7 +110,7 @@ DirectShowMediaType &DirectShowMediaType::operator=(const DirectShowMediaType &o
     return *this;
 }
 
-DirectShowMediaType &DirectShowMediaType::operator=(DirectShowMediaType &&other)
+DirectShowMediaType &DirectShowMediaType::operator=(DirectShowMediaType &&other) noexcept
 {
     move(&mediaType, other.mediaType);
     return *this;
diff --git a/src/plugins/directshow/common/directshowmediatype.h b/src/plugins/directshow/common/directshowmediatype.h
index 7f495f3b2..ee44329a5 100644
--- a/src/plugins/directshow/common/directshowmediatype.h
+++ b/src/plugins/directshow/common/directshowmediatype.h
@@ -54,13 +54,13 @@ class DirectShowMediaType
 public:
     DirectShowMediaType();
     DirectShowMediaType(const DirectShowMediaType &other);
-    DirectShowMediaType(DirectShowMediaType &&other);
+    DirectShowMediaType(DirectShowMediaType &&other) noexcept;
     explicit DirectShowMediaType(const AM_MEDIA_TYPE &type);
     explicit DirectShowMediaType(AM_MEDIA_TYPE &&type);
     ~DirectShowMediaType() { clear(mediaType); }
 
     DirectShowMediaType &operator =(const DirectShowMediaType &other);
-    DirectShowMediaType &operator =(DirectShowMediaType &&other);
+    DirectShowMediaType &operator =(DirectShowMediaType &&other) noexcept;
 
     void clear() { clear(mediaType); }
 
diff --git a/src/plugins/directshow/common/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp
index 65b54b8e9..99304bcf1 100644
--- a/src/plugins/directshow/common/directshowpin.cpp
+++ b/src/plugins/directshow/common/directshowpin.cpp
@@ -56,10 +56,7 @@ DirectShowPin::DirectShowPin(DirectShowBaseFilter *filter, const QString &name,
 {
 }
 
-DirectShowPin::~DirectShowPin()
-{
-
-}
+DirectShowPin::~DirectShowPin() = default;
 
 HRESULT DirectShowPin::Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt)
 {
@@ -403,9 +400,7 @@ DirectShowOutputPin::DirectShowOutputPin(DirectShowBaseFilter *filter, const QSt
 
 }
 
-DirectShowOutputPin::~DirectShowOutputPin()
-{
-}
+DirectShowOutputPin::~DirectShowOutputPin() = default;
 
 HRESULT DirectShowOutputPin::completeConnection(IPin *pin)
 {
@@ -511,10 +506,7 @@ DirectShowInputPin::DirectShowInputPin(DirectShowBaseFilter *filter, const QStri
     ZeroMemory(&m_sampleProperties, sizeof(m_sampleProperties));
 }
 
-DirectShowInputPin::~DirectShowInputPin()
-{
-
-}
+DirectShowInputPin::~DirectShowInputPin() = default;
 
 HRESULT DirectShowInputPin::connectionEnded()
 {
diff --git a/src/plugins/directshow/common/directshowpin.h b/src/plugins/directshow/common/directshowpin.h
index 9598cf525..5e513d002 100644
--- a/src/plugins/directshow/common/directshowpin.h
+++ b/src/plugins/directshow/common/directshowpin.h
@@ -68,30 +68,30 @@ public:
     virtual HRESULT setActive(bool active);
 
     // IPin
-    STDMETHODIMP Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt);
-    STDMETHODIMP ReceiveConnection(IPin *pConnector, const AM_MEDIA_TYPE *pmt);
-    STDMETHODIMP Disconnect();
-    STDMETHODIMP ConnectedTo(IPin **ppPin);
+    STDMETHODIMP Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) override;
+    STDMETHODIMP ReceiveConnection(IPin *pConnector, const AM_MEDIA_TYPE *pmt) override;
+    STDMETHODIMP Disconnect() override;
+    STDMETHODIMP ConnectedTo(IPin **ppPin) override;
 
-    STDMETHODIMP ConnectionMediaType(AM_MEDIA_TYPE *pmt);
+    STDMETHODIMP ConnectionMediaType(AM_MEDIA_TYPE *pmt) override;
 
-    STDMETHODIMP QueryPinInfo(PIN_INFO *pInfo);
-    STDMETHODIMP QueryId(LPWSTR *Id);
+    STDMETHODIMP QueryPinInfo(PIN_INFO *pInfo) override;
+    STDMETHODIMP QueryId(LPWSTR *Id) override;
 
-    STDMETHODIMP QueryAccept(const AM_MEDIA_TYPE *pmt);
+    STDMETHODIMP QueryAccept(const AM_MEDIA_TYPE *pmt) override;
 
-    STDMETHODIMP EnumMediaTypes(IEnumMediaTypes **ppEnum);
+    STDMETHODIMP EnumMediaTypes(IEnumMediaTypes **ppEnum) override;
 
-    STDMETHODIMP QueryInternalConnections(IPin **apPin, ULONG *nPin);
+    STDMETHODIMP QueryInternalConnections(IPin **apPin, ULONG *nPin) override;
 
-    STDMETHODIMP EndOfStream();
+    STDMETHODIMP EndOfStream() override;
 
-    STDMETHODIMP BeginFlush();
-    STDMETHODIMP EndFlush();
+    STDMETHODIMP BeginFlush() override;
+    STDMETHODIMP EndFlush() override;
 
-    STDMETHODIMP NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate);
+    STDMETHODIMP NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) override;
 
-    STDMETHODIMP QueryDirection(PIN_DIRECTION *pPinDir);
+    STDMETHODIMP QueryDirection(PIN_DIRECTION *pPinDir) override;
 
 protected:
     DirectShowPin(DirectShowBaseFilter *filter, const QString &name, PIN_DIRECTION direction);
@@ -140,27 +140,28 @@ class DirectShowInputPin : public DirectShowPin
                          , public IMemInputPin
 {
 public:
-    virtual ~DirectShowInputPin();
+     ~DirectShowInputPin() override;
 
     const AM_SAMPLE2_PROPERTIES *currentSampleProperties() const { return &m_sampleProperties; }
 
     // DirectShowPin
-    HRESULT connectionEnded();
-    HRESULT setActive(bool active);
+    HRESULT connectionEnded() override;
+    HRESULT setActive(bool active) override;
 
     // IPin
-    STDMETHODIMP EndOfStream();
-    STDMETHODIMP BeginFlush();
-    STDMETHODIMP EndFlush();
+    STDMETHODIMP EndOfStream() override;
+    STDMETHODIMP BeginFlush() override;
+    STDMETHODIMP EndFlush() override;
 
     // IMemInputPin
-    STDMETHODIMP GetAllocator(IMemAllocator **ppAllocator);
-    STDMETHODIMP NotifyAllocator(IMemAllocator *pAllocator, BOOL bReadOnly);
-    STDMETHODIMP GetAllocatorRequirements(ALLOCATOR_PROPERTIES *pProps);
-
-    STDMETHODIMP Receive(IMediaSample *pSample);
-    STDMETHODIMP ReceiveMultiple(IMediaSample **pSamples, long nSamples, long *nSamplesProcessed);
-    STDMETHODIMP ReceiveCanBlock();
+    STDMETHODIMP GetAllocator(IMemAllocator **ppAllocator) override;
+    STDMETHODIMP NotifyAllocator(IMemAllocator *pAllocator, BOOL bReadOnly) override;
+    STDMETHODIMP GetAllocatorRequirements(ALLOCATOR_PROPERTIES *pProps) override;
+
+    STDMETHODIMP Receive(IMediaSample *pSample) override;
+    STDMETHODIMP ReceiveMultiple(IMediaSample **pSamples, long nSamples,
+                                 long *nSamplesProcessed) override;
+    STDMETHODIMP ReceiveCanBlock() override;
 
 protected:
     DirectShowInputPin(DirectShowBaseFilter *filter, const QString &name);
diff --git a/src/plugins/directshow/common/directshowsamplegrabber.cpp b/src/plugins/directshow/common/directshowsamplegrabber.cpp
index fb95370ca..fec59b538 100644
--- a/src/plugins/directshow/common/directshowsamplegrabber.cpp
+++ b/src/plugins/directshow/common/directshowsamplegrabber.cpp
@@ -51,20 +51,21 @@ static const CLSID cLSID_SampleGrabber = { 0xC1F400A0, 0x3F08, 0x11d3, { 0x9F, 0
 
 class SampleGrabberCallbackPrivate : public ISampleGrabberCB
 {
+    Q_DISABLE_COPY(SampleGrabberCallbackPrivate)
 public:
     explicit SampleGrabberCallbackPrivate(DirectShowSampleGrabber *grabber)
         : m_ref(1)
         , m_grabber(grabber)
     { }
 
-    virtual ~SampleGrabberCallbackPrivate() { }
+    virtual ~SampleGrabberCallbackPrivate() = default;
 
-    STDMETHODIMP_(ULONG) AddRef()
+    STDMETHODIMP_(ULONG) AddRef() override
     {
         return InterlockedIncrement(&m_ref);
     }
 
-    STDMETHODIMP_(ULONG) Release()
+    STDMETHODIMP_(ULONG) Release() override
     {
         ULONG ref = InterlockedDecrement(&m_ref);
         if (ref == 0)
@@ -72,7 +73,7 @@ public:
         return ref;
     }
 
-    STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject)
+    STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override
     {
         if (NULL == ppvObject)
             return E_POINTER;
@@ -89,7 +90,7 @@ public:
         return E_NOTIMPL;
     }
 
-    STDMETHODIMP SampleCB(double time, IMediaSample *mediaSample)
+    STDMETHODIMP SampleCB(double time, IMediaSample *mediaSample) override
     {
         if (m_grabber)
             Q_EMIT m_grabber->sampleAvailable(time, mediaSample);
@@ -97,7 +98,7 @@ public:
         return S_OK;
     }
 
-    STDMETHODIMP BufferCB(double time, BYTE *buffer, long bufferLen)
+    STDMETHODIMP BufferCB(double time, BYTE *buffer, long bufferLen) override
     {
         if (m_grabber) {
             // Deep copy, the data might be modified or freed after the callback returns
diff --git a/src/plugins/directshow/common/directshowvideobuffer.h b/src/plugins/directshow/common/directshowvideobuffer.h
index 85e02b53d..a85a3ca34 100644
--- a/src/plugins/directshow/common/directshowvideobuffer.h
+++ b/src/plugins/directshow/common/directshowvideobuffer.h
@@ -50,14 +50,14 @@ class DirectShowVideoBuffer : public QAbstractVideoBuffer
 {
 public:
     DirectShowVideoBuffer(IMediaSample *sample, int bytesPerLine);
-    ~DirectShowVideoBuffer();
+    ~DirectShowVideoBuffer() override;
 
     IMediaSample *sample() { return m_sample; }
 
-    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine);
-    void unmap();
+    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override;
+    void unmap() override;
 
-    MapMode mapMode() const;
+    MapMode mapMode() const override;
 
 private:
     IMediaSample *m_sample;
diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h
index f57262e37..2e87058c3 100644
--- a/src/plugins/directshow/dsserviceplugin.h
+++ b/src/plugins/directshow/dsserviceplugin.h
@@ -64,14 +64,14 @@ class DSServicePlugin
 #endif
 
 public:
-    QMediaService* create(QString const& key);
-    void release(QMediaService *service);
+    QMediaService* create(QString const& key) override;
+    void release(QMediaService *service) override;
 
-    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
+    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override;
 
-    QByteArray defaultDevice(const QByteArray &service) const;
-    QList<QByteArray> devices(const QByteArray &service) const;
-    QString deviceDescription(const QByteArray &service, const QByteArray &device);
+    QByteArray defaultDevice(const QByteArray &service) const override;
+    QList<QByteArray> devices(const QByteArray &service) const override;
+    QString deviceDescription(const QByteArray &service, const QByteArray &device) override;
 };
 
 QT_END_NAMESPACE
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();