From acc49e582abf76c962851f53cbd66134812f6a1f Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
Date: Sun, 24 Sep 2017 23:54:59 +0200
Subject: Replace Q_NULLPTR with nullptr

Change-Id: I3b7601b4a97f8a2b1d2da6ef134f1577846ba713
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/multimedia/playback/qmediaplayer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/multimedia/playback/qmediaplayer.h')

diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index 4e676a2d8..e69a32ee4 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -120,7 +120,7 @@ public:
         MediaIsPlaylist
     };
 
-    explicit QMediaPlayer(QObject *parent = Q_NULLPTR, Flags flags = Flags());
+    explicit QMediaPlayer(QObject *parent = nullptr, Flags flags = Flags());
     ~QMediaPlayer();
 
     static QMultimedia::SupportEstimate hasSupport(const QString &mimeType,
@@ -178,7 +178,7 @@ public Q_SLOTS:
 
     void setPlaybackRate(qreal rate);
 
-    void setMedia(const QMediaContent &media, QIODevice *stream = Q_NULLPTR);
+    void setMedia(const QMediaContent &media, QIODevice *stream = nullptr);
     void setPlaylist(QMediaPlaylist *playlist);
 
     void setNetworkConfigurations(const QList<QNetworkConfiguration> &configurations);
-- 
cgit v1.2.3