1 files changed, 43 insertions, 43 deletions

diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 19d4ec42c..3308537a9 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -109,12 +109,12 @@ class QMediaPlayerPrivate : public QMediaObjectPrivate
 
 public:
     QMediaPlayerPrivate()
-        : provider(0)
-        , control(0)
-        , audioRoleControl(0)
-        , customAudioRoleControl(0)
-        , playlist(0)
-        , networkAccessControl(0)
+        : provider(nullptr)
+        , control(nullptr)
+        , audioRoleControl(nullptr)
+        , customAudioRoleControl(nullptr)
+        , playlist(nullptr)
+        , networkAccessControl(nullptr)
         , state(QMediaPlayer::StoppedState)
         , status(QMediaPlayer::UnknownMediaStatus)
         , error(QMediaPlayer::NoError)
@@ -148,7 +148,7 @@ public:
     QMediaPlaylist *parentPlaylist(QMediaPlaylist *pls);
     bool isInChain(const QUrl &url);
 
-    void setMedia(const QMediaContent &media, QIODevice *stream = 0);
+    void setMedia(const QMediaContent &media, QIODevice *stream = nullptr);
 
     void setPlaylist(QMediaPlaylist *playlist);
     void setPlaylistMedia();
@@ -175,7 +175,7 @@ QMediaPlaylist *QMediaPlayerPrivate::parentPlaylist(QMediaPlaylist *pls)
     for (QMediaPlaylist *current = rootMedia.playlist(); current && current != pls; current = current->currentMedia().playlist())
         if (current->currentMedia().playlist() == pls)
             return current;
-    return 0;
+    return nullptr;
 }
 
 bool QMediaPlayerPrivate::isInChain(const QUrl &url)
@@ -309,7 +309,7 @@ void QMediaPlayerPrivate::_q_updateMedia(const QMediaContent &media)
 
     const QMediaPlayer::State currentState = state;
 
-    setMedia(media, 0);
+    setMedia(media, nullptr);
 
     if (!media.isNull()) {
         switch (currentState) {
@@ -329,8 +329,8 @@ void QMediaPlayerPrivate::_q_updateMedia(const QMediaContent &media)
 
 void QMediaPlayerPrivate::_q_playlistDestroyed()
 {
-    playlist = 0;
-    setMedia(QMediaContent(), 0);
+    playlist = nullptr;
+    setMedia(QMediaContent(), nullptr);
 }
 
 void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream)
@@ -360,7 +360,7 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
             // on the backend side since we can't load the new one and we want to be in the
             // InvalidMedia status.
             ignoreNextStatusChange = QMediaPlayer::NoMedia;
-            control->setMedia(QMediaContent(), 0);
+            control->setMedia(QMediaContent(), nullptr);
 
         } else if (hasStreamPlaybackFeature) {
             control->setMedia(media, file.data());
@@ -386,7 +386,7 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
             tempFile->close();
 
             file.reset(tempFile);
-            control->setMedia(QMediaContent(QUrl::fromLocalFile(file->fileName())), 0);
+            control->setMedia(QMediaContent(QUrl::fromLocalFile(file->fileName())), nullptr);
 #else
             qWarning("Qt was built with -no-feature-temporaryfile: playback from resource file is not supported!");
 #endif
@@ -447,13 +447,13 @@ void QMediaPlayerPrivate::setPlaylistMedia()
             //                      media is not changed,
             //                      frontend needs to emit currentMediaChanged
             bool isSameMedia = (q->currentMedia() == playlist->currentMedia());
-            setMedia(playlist->currentMedia(), 0);
+            setMedia(playlist->currentMedia(), nullptr);
             if (isSameMedia) {
                 emit q->currentMediaChanged(q->currentMedia());
             }
         }
     } else {
-        setMedia(QMediaContent(), 0);
+        setMedia(QMediaContent(), nullptr);
     }
 }
 
@@ -545,7 +545,7 @@ void QMediaPlayerPrivate::_q_handlePlaylistLoadFailed()
     if (playlist)
         playlist->next();
     else
-        setMedia(QMediaContent(), 0);
+        setMedia(QMediaContent(), nullptr);
 }
 
 static QMediaService *playerService(QMediaPlayer::Flags flags)
@@ -583,12 +583,12 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags):
     Q_D(QMediaPlayer);
 
     d->provider = QMediaServiceProvider::defaultServiceProvider();
-    if (d->service == 0) {
+    if (d->service == nullptr) {
         d->error = ServiceMissingError;
     } else {
         d->control = qobject_cast<QMediaPlayerControl*>(d->service->requestControl(QMediaPlayerControl_iid));
         d->networkAccessControl = qobject_cast<QMediaNetworkAccessControl*>(d->service->requestControl(QMediaNetworkAccessControl_iid));
-        if (d->control != 0) {
+        if (d->control != nullptr) {
             connect(d->control, SIGNAL(mediaChanged(QMediaContent)), SLOT(_q_handleMediaChanged(QMediaContent)));
             connect(d->control, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(_q_stateChanged(QMediaPlayer::State)));
             connect(d->control, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)),
@@ -631,7 +631,7 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags):
                 }
             }
         }
-        if (d->networkAccessControl != 0) {
+        if (d->networkAccessControl != nullptr) {
             connect(d->networkAccessControl, SIGNAL(configurationChanged(QNetworkConfiguration)),
             this, SIGNAL(networkConfigurationChanged(QNetworkConfiguration)));
         }
@@ -685,7 +685,7 @@ const QIODevice *QMediaPlayer::mediaStream() const
     if (d->control && d->qrcMedia.isNull())
         return d->control->mediaStream();
 
-    return 0;
+    return nullptr;
 }
 
 QMediaPlaylist *QMediaPlayer::playlist() const
@@ -737,7 +737,7 @@ QMediaPlayer::State QMediaPlayer::state() const
 
     // In case if EndOfMedia status is already received
     // but state is not.
-    if (d->control != 0
+    if (d->control != nullptr
         && d->status == QMediaPlayer::EndOfMedia
         && d->state != d->control->state()) {
         return d->control->state();
@@ -755,7 +755,7 @@ qint64 QMediaPlayer::duration() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->duration();
 
     return -1;
@@ -765,7 +765,7 @@ qint64 QMediaPlayer::position() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->position();
 
     return 0;
@@ -775,7 +775,7 @@ int QMediaPlayer::volume() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->volume();
 
     return 0;
@@ -785,7 +785,7 @@ bool QMediaPlayer::isMuted() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->isMuted();
 
     return false;
@@ -795,7 +795,7 @@ int QMediaPlayer::bufferStatus() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->bufferStatus();
 
     return 0;
@@ -805,7 +805,7 @@ bool QMediaPlayer::isAudioAvailable() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->isAudioAvailable();
 
     return false;
@@ -815,7 +815,7 @@ bool QMediaPlayer::isVideoAvailable() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->isVideoAvailable();
 
     return false;
@@ -825,7 +825,7 @@ bool QMediaPlayer::isSeekable() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->isSeekable();
 
     return false;
@@ -835,7 +835,7 @@ qreal QMediaPlayer::playbackRate() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         return d->control->playbackRate();
 
     return 0.0;
@@ -880,7 +880,7 @@ void QMediaPlayer::play()
 {
     Q_D(QMediaPlayer);
 
-    if (d->control == 0) {
+    if (d->control == nullptr) {
         QMetaObject::invokeMethod(this, "_q_error", Qt::QueuedConnection,
                                     Q_ARG(int, QMediaPlayer::ServiceMissingError),
                                     Q_ARG(QString, tr("The QMediaPlayer object does not have a valid service")));
@@ -918,7 +918,7 @@ void QMediaPlayer::pause()
 {
     Q_D(QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         d->control->pause();
 }
 
@@ -930,7 +930,7 @@ void QMediaPlayer::stop()
 {
     Q_D(QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         d->control->stop();
 
     // If media player didn't stop in response to control.
@@ -949,7 +949,7 @@ void QMediaPlayer::setPosition(qint64 position)
 {
     Q_D(QMediaPlayer);
 
-    if (d->control == 0)
+    if (d->control == nullptr)
         return;
 
     d->control->setPosition(qMax(position, 0ll));
@@ -959,7 +959,7 @@ void QMediaPlayer::setVolume(int v)
 {
     Q_D(QMediaPlayer);
 
-    if (d->control == 0)
+    if (d->control == nullptr)
         return;
 
     int clamped = qBound(0, v, 100);
@@ -973,7 +973,7 @@ void QMediaPlayer::setMuted(bool muted)
 {
     Q_D(QMediaPlayer);
 
-    if (d->control == 0 || muted == isMuted())
+    if (d->control == nullptr || muted == isMuted())
         return;
 
     d->control->setMuted(muted);
@@ -983,7 +983,7 @@ void QMediaPlayer::setPlaybackRate(qreal rate)
 {
     Q_D(QMediaPlayer);
 
-    if (d->control != 0)
+    if (d->control != nullptr)
         d->control->setPlaybackRate(rate);
 }
 
@@ -1011,7 +1011,7 @@ void QMediaPlayer::setMedia(const QMediaContent &media, QIODevice *stream)
 
     QMediaContent oldMedia = d->rootMedia;
     d->disconnectPlaylist();
-    d->playlist = 0;
+    d->playlist = nullptr;
     d->rootMedia = media;
     d->nestedPlaylists = 0;
 
@@ -1097,7 +1097,7 @@ void QMediaPlayer::setVideoOutput(QVideoWidget *output)
     // We don't know (in this library) that QVideoWidget inherits QObject
     QObject *outputObject = reinterpret_cast<QObject*>(output);
 
-    d->videoOutput = outputObject && bind(outputObject) ? outputObject : 0;
+    d->videoOutput = outputObject && bind(outputObject) ? outputObject : nullptr;
 }
 
 /*!
@@ -1119,7 +1119,7 @@ void QMediaPlayer::setVideoOutput(QGraphicsVideoItem *output)
     // but QObject inheritance depends on QObject coming first, so try this out.
     QObject *outputObject = reinterpret_cast<QObject*>(output);
 
-    d->videoOutput = outputObject && bind(outputObject) ? outputObject : 0;
+    d->videoOutput = outputObject && bind(outputObject) ? outputObject : nullptr;
 }
 
 /*!
@@ -1139,14 +1139,14 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)
         if (d->videoOutput)
             unbind(d->videoOutput);
 
-        d->videoOutput = 0;
+        d->videoOutput = nullptr;
 
         if (surface && bind(&d->surfaceOutput))
             d->videoOutput =  &d->surfaceOutput;
     }  else if (!surface) {
         //unbind the surfaceOutput if null surface is set
         unbind(&d->surfaceOutput);
-        d->videoOutput = 0;
+        d->videoOutput = nullptr;
     }
 }
 
@@ -1165,7 +1165,7 @@ QAudio::Role QMediaPlayer::audioRole() const
 {
     Q_D(const QMediaPlayer);
 
-    if (d->audioRoleControl != NULL)
+    if (d->audioRoleControl != nullptr)
         return d->audioRoleControl->audioRole();
 
     return QAudio::UnknownRole;