Avoid initializing QFlags with 0 or nullptr

It is being deprecated.

Change-Id: I26b871fe9b989972ab1d2c18de344dc9c9275e9f
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>

7 files changed, 27 insertions, 46 deletions

diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index e8bb352f7..9b51bcddf 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -556,7 +556,7 @@ static QMediaService *playerService(QMediaPlayer::Flags flags)
 {
     QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider();
     if (flags) {
-        QMediaServiceProviderHint::Features features = 0;
+        QMediaServiceProviderHint::Features features;
         if (flags & QMediaPlayer::LowLatency)
             features |= QMediaServiceProviderHint::LowLatencyPlayback;
 
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index d8ffe42ae..93b560d8c 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -56,7 +56,7 @@ class QMediaServiceProviderHintPrivate : public QSharedData
 {
 public:
     QMediaServiceProviderHintPrivate(QMediaServiceProviderHint::Type type)
-        :type(type), cameraPosition(QCamera::UnspecifiedPosition), features(nullptr)
+        : type(type)
     {
     }
 
@@ -77,7 +77,7 @@ public:
 
     QMediaServiceProviderHint::Type type;
     QByteArray device;
-    QCamera::Position cameraPosition;
+    QCamera::Position cameraPosition = QCamera::UnspecifiedPosition;
     QString mimeType;
     QStringList codecs;
     QMediaServiceProviderHint::Features features;
@@ -712,7 +712,7 @@ QMediaServiceProviderHint::Features QMediaServiceProvider::supportedFeatures(con
 {
     Q_UNUSED(service);
 
-    return QMediaServiceProviderHint::Features(nullptr);
+    return {};
 }
 
 /*!
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();
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
index 4caf42474..bdfa23dfb 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
@@ -303,7 +303,7 @@ QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode,
                     if (!runnable)
                         continue;
 
-                    QVideoFilterRunnable::RunFlags flags = 0;
+                    QVideoFilterRunnable::RunFlags flags;
                     if (i == m_filters.count() - 1)
                         flags |= QVideoFilterRunnable::LastInChain;
 
@@ -362,7 +362,7 @@ QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode,
     videoNode->setTexturedRectGeometry(m_renderedRect, m_sourceTextureRect,
                                        qNormalizedOrientation(q->orientation()));
     if (m_frameChanged) {
-        QSGVideoNode::FrameFlags flags = 0;
+        QSGVideoNode::FrameFlags flags;
         if (isFrameModified)
             flags |= QSGVideoNode::FrameFiltered;
         videoNode->setCurrentFrame(m_frame, flags);
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp
index 66ace2045..4167b18ea 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp
@@ -75,10 +75,10 @@ public:
 
     QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const
     {
+        QMediaServiceProviderHint::Features result;
         if (service == QByteArray(Q_MEDIASERVICE_MEDIAPLAYER))
-            return QMediaServiceProviderHint::LowLatencyPlayback;
-        else
-            return 0;
+            result |= QMediaServiceProviderHint::LowLatencyPlayback;
+        return result;
     }
 };
 
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp
index 92707169c..6a7725fee 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp
@@ -75,10 +75,10 @@ public:
 
     QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const
     {
+        QMediaServiceProviderHint::Features result;
         if (service == QByteArray(Q_MEDIASERVICE_MEDIAPLAYER))
-            return QMediaServiceProviderHint::StreamPlayback;
-        else
-            return 0;
+            result |= QMediaServiceProviderHint::StreamPlayback;
+        return result;
     }
 };