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>

12 files changed, 50 insertions, 71 deletions

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