Modernize code base

Run clang-tidy over the code base with some code modernization
options.

Change-Id: I9e74d1225bce333e74224e3b92c02c7e9884d8f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

4 files changed, 50 insertions, 64 deletions

diff --git a/src/multimediawidgets/qcameraviewfinder.cpp b/src/multimediawidgets/qcameraviewfinder.cpp
index adc55de3f..0399e40e1 100644
--- a/src/multimediawidgets/qcameraviewfinder.cpp
+++ b/src/multimediawidgets/qcameraviewfinder.cpp
@@ -64,10 +64,6 @@ class QCameraViewfinderPrivate : public QVideoWidgetPrivate
 {
     Q_DECLARE_NON_CONST_PUBLIC(QCameraViewfinder)
 public:
-    QCameraViewfinderPrivate():
-        QVideoWidgetPrivate()
-    {
-    }
 };
 
 /*!
diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index 7c0521471..8af7abf95 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -58,25 +58,18 @@ class QGraphicsVideoItemPrivate
 {
 public:
     QGraphicsVideoItemPrivate()
-        : q_ptr(0)
-        , surface(0)
-        , mediaObject(0)
-        , service(0)
-        , rendererControl(0)
-        , aspectRatioMode(Qt::KeepAspectRatio)
-        , updatePaintDevice(true)
-        , rect(0.0, 0.0, 320, 240)
+        : rect(0.0, 0.0, 320, 240)
     {
     }
 
-    QGraphicsVideoItem *q_ptr;
+    QGraphicsVideoItem *q_ptr = nullptr;
 
-    QPainterVideoSurface *surface;
+    QPainterVideoSurface *surface = nullptr;
     QPointer<QMediaObject> mediaObject;
-    QMediaService *service;
-    QVideoRendererControl *rendererControl;
-    Qt::AspectRatioMode aspectRatioMode;
-    bool updatePaintDevice;
+    QMediaService *service = nullptr;
+    QVideoRendererControl *rendererControl = nullptr;
+    Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio;
+    bool updatePaintDevice = true;
     QRectF rect;
     QRectF boundingRect;
     QRectF sourceRect;
@@ -95,13 +88,13 @@ void QGraphicsVideoItemPrivate::clearService()
 {
     if (rendererControl) {
         surface->stop();
-        rendererControl->setSurface(0);
+        rendererControl->setSurface(nullptr);
         service->releaseControl(rendererControl);
-        rendererControl = 0;
+        rendererControl = nullptr;
     }
     if (service) {
         QObject::disconnect(service, SIGNAL(destroyed()), q_ptr, SLOT(_q_serviceDestroyed()));
-        service = 0;
+        service = nullptr;
     }
 }
 
@@ -159,8 +152,8 @@ void QGraphicsVideoItemPrivate::_q_updateNativeSize()
 
 void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
 {
-    rendererControl = 0;
-    service = 0;
+    rendererControl = nullptr;
+    service = nullptr;
 
     surface->stop();
 }
@@ -212,7 +205,7 @@ QGraphicsVideoItem::QGraphicsVideoItem(QGraphicsItem *parent)
 QGraphicsVideoItem::~QGraphicsVideoItem()
 {
     if (d_ptr->rendererControl) {
-        d_ptr->rendererControl->setSurface(0);
+        d_ptr->rendererControl->setSurface(nullptr);
         d_ptr->service->releaseControl(d_ptr->rendererControl);
     }
 
@@ -287,7 +280,7 @@ bool QGraphicsVideoItem::setMediaObject(QMediaObject *object)
         }
     }
 
-    d->mediaObject = 0;
+    d->mediaObject = nullptr;
     return false;
 }
 
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
index 6ba7cff02..05a19d2a2 100644
--- a/src/multimediawidgets/qpaintervideosurface.cpp
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
@@ -70,10 +70,10 @@ class QVideoSurfaceGenericPainter : public QVideoSurfacePainter
 public:
     QVideoSurfaceGenericPainter();
 
-    QList<QVideoFrame::PixelFormat> supportedPixelFormats(
+    [[nodiscard]] QList<QVideoFrame::PixelFormat> supportedPixelFormats(
             QAbstractVideoBuffer::HandleType handleType) const override;
 
-    bool isFormatSupported(const QVideoSurfaceFormat &format) const override;
+    [[nodiscard]] bool isFormatSupported(const QVideoSurfaceFormat &format) const override;
 
     QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) override;
     void stop() override;
@@ -89,15 +89,12 @@ private:
     QList<QVideoFrame::PixelFormat> m_imagePixelFormats;
     QVideoFrame m_frame;
     QSize m_imageSize;
-    QImage::Format m_imageFormat;
-    QVideoSurfaceFormat::Direction m_scanLineDirection;
-    bool m_mirrored;
+    QImage::Format m_imageFormat = QImage::Format_Invalid;
+    QVideoSurfaceFormat::Direction m_scanLineDirection = QVideoSurfaceFormat::TopToBottom;
+    bool m_mirrored = false;
 };
 
 QVideoSurfaceGenericPainter::QVideoSurfaceGenericPainter()
-    : m_imageFormat(QImage::Format_Invalid)
-    , m_scanLineDirection(QVideoSurfaceFormat::TopToBottom)
-    , m_mirrored(false)
 {
     m_imagePixelFormats << QVideoFrame::Format_RGB32;
 
@@ -255,11 +252,11 @@ class QVideoSurfaceGLPainter : public QVideoSurfacePainter, protected QOpenGLFun
 {
 public:
     QVideoSurfaceGLPainter(QOpenGLContext *context);
-    ~QVideoSurfaceGLPainter();
-    QList<QVideoFrame::PixelFormat> supportedPixelFormats(
+    ~QVideoSurfaceGLPainter() override;
+    [[nodiscard]] QList<QVideoFrame::PixelFormat> supportedPixelFormats(
             QAbstractVideoBuffer::HandleType handleType) const override;
 
-    bool isFormatSupported(const QVideoSurfaceFormat &format) const override;
+    [[nodiscard]] bool isFormatSupported(const QVideoSurfaceFormat &format) const override;
 
     void stop() override;
 
@@ -276,7 +273,7 @@ protected:
     void initYuv420PTextureInfo(const QSize &size);
     void initYv12TextureInfo(const QSize &size);
 
-    bool needsSwizzling(const QVideoSurfaceFormat &format) const {
+    [[nodiscard]] bool needsSwizzling(const QVideoSurfaceFormat &format) const {
         return format.pixelFormat() == QVideoFrame::Format_RGB32
                || format.pixelFormat() == QVideoFrame::Format_ARGB32;
     }
@@ -330,7 +327,7 @@ QVideoSurfaceGLPainter::~QVideoSurfaceGLPainter()
 
 void QVideoSurfaceGLPainter::viewportDestroyed()
 {
-    m_context = 0;
+    m_context = nullptr;
 }
 
 QList<QVideoFrame::PixelFormat> QVideoSurfaceGLPainter::supportedPixelFormats(
@@ -724,7 +721,7 @@ QAbstractVideoSurface::Error QVideoSurfaceArbFpPainter::start(const QVideoSurfac
 
     QAbstractVideoSurface::Error error = QAbstractVideoSurface::NoError;
 
-    const char *program = 0;
+    const char *program = nullptr;
 
     if (format.handleType() == QAbstractVideoBuffer::NoHandle) {
         switch (format.pixelFormat()) {
@@ -1099,7 +1096,7 @@ QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::start(const QVideoSurface
 
     QAbstractVideoSurface::Error error = QAbstractVideoSurface::NoError;
 
-    const char *fragmentProgram = 0;
+    const char *fragmentProgram = nullptr;
 
     if (format.handleType() == QAbstractVideoBuffer::NoHandle) {
         switch (format.pixelFormat()) {
@@ -1347,9 +1344,9 @@ QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint(
 */
 QPainterVideoSurface::QPainterVideoSurface(QObject *parent)
     : QAbstractVideoSurface(parent)
-    , m_painter(0)
+    , m_painter(nullptr)
 #if QT_CONFIG(opengl)
-    , m_glContext(0)
+    , m_glContext(nullptr)
     , m_shaderTypes(NoShaders)
     , m_shaderType(NoShaders)
 #endif
@@ -1626,7 +1623,7 @@ void QPainterVideoSurface::updateGLContext()
         if (isActive()) {
             m_painter->stop();
             delete m_painter;
-            m_painter = 0;
+            m_painter = nullptr;
             m_ready = false;
 
             setError(ResourceError);
@@ -1675,14 +1672,14 @@ void QPainterVideoSurface::setShaderType(ShaderType type)
         if (isActive()) {
             m_painter->stop();
             delete m_painter;
-            m_painter = 0;
+            m_painter = nullptr;
             m_ready = false;
 
             setError(ResourceError);
             QAbstractVideoSurface::stop();
         } else {
             delete m_painter;
-            m_painter = 0;
+            m_painter = nullptr;
         }
         emit supportedFormatsChanged();
     }
@@ -1698,7 +1695,7 @@ void QPainterVideoSurface::viewportDestroyed()
         setError(ResourceError);
         stop();
         delete m_painter;
-        m_painter = 0;
+        m_painter = nullptr;
     }
 }
 
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index bab1ffbff..29480921c 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -168,7 +168,7 @@ void QRendererVideoWidgetBackend::releaseControl()
 void QRendererVideoWidgetBackend::clearSurface()
 {
     if (m_rendererControl)
-        m_rendererControl->setSurface(0);
+        m_rendererControl->setSurface(nullptr);
 }
 
 void QRendererVideoWidgetBackend::setBrightness(int brightness)
@@ -461,7 +461,7 @@ void QVideoWidgetPrivate::clearService()
             QLayout *layout = q_func()->layout();
 
             for (QLayoutItem *item = layout->takeAt(0); item; item = layout->takeAt(0)) {
-                item->widget()->setParent(0);
+                item->widget()->setParent(nullptr);
                 delete item;
             }
             delete layout;
@@ -469,23 +469,23 @@ void QVideoWidgetPrivate::clearService()
             widgetBackend->releaseControl();
 
             delete widgetBackend;
-            widgetBackend = 0;
+            widgetBackend = nullptr;
         } else if (rendererBackend) {
             rendererBackend->clearSurface();
             rendererBackend->releaseControl();
 
             delete rendererBackend;
-            rendererBackend = 0;
+            rendererBackend = nullptr;
         } else if (windowBackend) {
             windowBackend->releaseControl();
 
             delete windowBackend;
-            windowBackend = 0;
+            windowBackend = nullptr;
         }
 
-        currentBackend = 0;
-        currentControl = 0;
-        service = 0;
+        currentBackend = nullptr;
+        currentControl = nullptr;
+        service = nullptr;
     }
 }
 
@@ -542,12 +542,12 @@ void QVideoWidgetPrivate::_q_serviceDestroyed()
     delete windowBackend;
     delete rendererBackend;
 
-    widgetBackend = 0;
-    windowBackend = 0;
-    rendererBackend = 0;
-    currentControl = 0;
-    currentBackend = 0;
-    service = 0;
+    widgetBackend = nullptr;
+    windowBackend = nullptr;
+    rendererBackend = nullptr;
+    currentControl = nullptr;
+    currentBackend = nullptr;
+    service = nullptr;
 }
 
 void QVideoWidgetPrivate::_q_brightnessChanged(int b)
@@ -683,15 +683,15 @@ bool QVideoWidget::setMediaObject(QMediaObject *object)
             if (isVisible())
                 d->rendererBackend->showEvent();
         } else {
-            d->service = 0;
-            d->mediaObject = 0;
+            d->service = nullptr;
+            d->mediaObject = nullptr;
 
             return false;
         }
 
         connect(d->service, SIGNAL(destroyed()), SLOT(_q_serviceDestroyed()));
     } else {
-        d->mediaObject = 0;
+        d->mediaObject = nullptr;
 
         return false;
     }
@@ -967,7 +967,7 @@ void QVideoWidget::showEvent(QShowEvent *event)
         d->windowBackend->releaseControl();
 
         delete d->windowBackend;
-        d->windowBackend = 0;
+        d->windowBackend = nullptr;
 
         d->createRendererBackend();
     }