From 65c9fe1cb69dc65ddd413700ab8494409c63c3dc Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 25 Nov 2019 13:17:46 +0100
Subject: Avoid initializing QFlags with 0 or nullptr

It is being deprecated.

Change-Id: I26b871fe9b989972ab1d2c18de344dc9c9275e9f
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 src/multimediawidgets/qvideowidget.cpp |  4 +--
 src/multimediawidgets/qvideowidget_p.h | 45 ++++++++++------------------------
 2 files changed, 15 insertions(+), 34 deletions(-)

(limited to 'src/multimediawidgets')

diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index a7d3665f8..5adc6c359 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -611,7 +611,7 @@ void QVideoWidgetPrivate::_q_dimensionsChanged()
     The \a parent is passed to QWidget.
 */
 QVideoWidget::QVideoWidget(QWidget *parent)
-    : QWidget(parent, 0)
+    : QWidget(parent, {})
     , d_ptr(new QVideoWidgetPrivate)
 {
     d_ptr->q_ptr = this;
@@ -621,7 +621,7 @@ QVideoWidget::QVideoWidget(QWidget *parent)
   \internal
 */
 QVideoWidget::QVideoWidget(QVideoWidgetPrivate &dd, QWidget *parent)
-    : QWidget(parent, 0)
+    : QWidget(parent, {})
     , d_ptr(&dd)
 {
     d_ptr->q_ptr = this;
diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h
index ef417b222..07912ee90 100644
--- a/src/multimediawidgets/qvideowidget_p.h
+++ b/src/multimediawidgets/qvideowidget_p.h
@@ -222,40 +222,21 @@ class QVideoWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QVideoWidget)
 public:
-    QVideoWidgetPrivate()
-        : q_ptr(0)
-        , mediaObject(0)
-        , service(0)
-        , widgetBackend(0)
-        , windowBackend(0)
-        , rendererBackend(0)
-        , currentControl(0)
-        , currentBackend(0)
-        , brightness(0)
-        , contrast(0)
-        , hue(0)
-        , saturation(0)
-        , aspectRatioMode(Qt::KeepAspectRatio)
-        , nonFullScreenFlags(0)
-        , wasFullScreen(false)
-    {
-    }
-
-    QVideoWidget *q_ptr;
+    QVideoWidget *q_ptr = nullptr;
     QPointer<QMediaObject> mediaObject;
-    QMediaService *service;
-    QVideoWidgetControlBackend *widgetBackend;
-    QWindowVideoWidgetBackend *windowBackend;
-    QRendererVideoWidgetBackend *rendererBackend;
-    QVideoWidgetControlInterface *currentControl;
-    QVideoWidgetBackend *currentBackend;
-    int brightness;
-    int contrast;
-    int hue;
-    int saturation;
-    Qt::AspectRatioMode aspectRatioMode;
+    QMediaService *service = nullptr;
+    QVideoWidgetControlBackend *widgetBackend = nullptr;
+    QWindowVideoWidgetBackend *windowBackend = nullptr;
+    QRendererVideoWidgetBackend *rendererBackend = nullptr;
+    QVideoWidgetControlInterface *currentControl = nullptr;
+    QVideoWidgetBackend *currentBackend = nullptr;
+    int brightness = 0;
+    int contrast = 0;
+    int hue = 0;
+    int saturation = 0;
+    Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio;
     Qt::WindowFlags nonFullScreenFlags;
-    bool wasFullScreen;
+    bool wasFullScreen = false;
 
     bool createWidgetBackend();
     bool createWindowBackend();
-- 
cgit v1.2.3