From 4e735ae42aca5c6957d8cf57d6858322569b794a Mon Sep 17 00:00:00 2001
From: Jochen Seemann <seemann.jochen@gmail.com>
Date: Sun, 22 Jul 2018 19:52:19 +0200
Subject: multimedia: modernize by using nullptr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id1084fec084b972aaa1d2389ee56ee831a821172
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 src/multimedia/recording/qmediarecorder.cpp | 46 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/multimedia/recording/qmediarecorder.cpp')

diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 3bab3dada..2b7729481 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -89,15 +89,15 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterMediaRecorderMetaTypes)
 
 
 QMediaRecorderPrivate::QMediaRecorderPrivate():
-     mediaObject(0),
-     control(0),
-     formatControl(0),
-     audioControl(0),
-     videoControl(0),
-     metaDataControl(0),
-     availabilityControl(0),
+     mediaObject(nullptr),
+     control(nullptr),
+     formatControl(nullptr),
+     audioControl(nullptr),
+     videoControl(nullptr),
+     metaDataControl(nullptr),
+     availabilityControl(nullptr),
      settingsChanged(false),
-     notifyTimer(0),
+     notifyTimer(nullptr),
      state(QMediaRecorder::StoppedState),
      error(QMediaRecorder::NoError)
 {
@@ -135,13 +135,13 @@ void QMediaRecorderPrivate::_q_error(int error, const QString &errorString)
 
 void QMediaRecorderPrivate::_q_serviceDestroyed()
 {
-    mediaObject = 0;
-    control = 0;
-    formatControl = 0;
-    audioControl = 0;
-    videoControl = 0;
-    metaDataControl = 0;
-    availabilityControl = 0;
+    mediaObject = nullptr;
+    control = nullptr;
+    formatControl = nullptr;
+    audioControl = nullptr;
+    videoControl = nullptr;
+    metaDataControl = nullptr;
+    availabilityControl = nullptr;
     settingsChanged = true;
 }
 
@@ -328,12 +328,12 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
         }
     }
 
-    d->control = 0;
-    d->formatControl = 0;
-    d->audioControl = 0;
-    d->videoControl = 0;
-    d->metaDataControl = 0;
-    d->availabilityControl = 0;
+    d->control = nullptr;
+    d->formatControl = nullptr;
+    d->audioControl = nullptr;
+    d->videoControl = nullptr;
+    d->metaDataControl = nullptr;
+    d->availabilityControl = nullptr;
 
     d->mediaObject = object;
 
@@ -407,7 +407,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
             }
         }
 
-        d->mediaObject = 0;
+        d->mediaObject = nullptr;
         return false;
     }
 
@@ -453,7 +453,7 @@ bool QMediaRecorder::isAvailable() const
 */
 QMultimedia::AvailabilityStatus QMediaRecorder::availability() const
 {
-    if (d_func()->control == NULL)
+    if (d_func()->control == nullptr)
         return QMultimedia::ServiceMissing;
 
     if (d_func()->availabilityControl)
-- 
cgit v1.2.3