summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback
diff options
context:
space:
mode:
authorKevin Funk <kevin.funk@kdab.com>2017-09-24 23:54:59 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-27 08:06:15 +0000
commitacc49e582abf76c962851f53cbd66134812f6a1f (patch)
treeba82ce531f711397af949ac62fa9b0ca06158c11 /src/multimedia/playback
parent97009b6470c09b9889870873a5c82a6a0bb565f8 (diff)
Replace Q_NULLPTR with nullptr
Change-Id: I3b7601b4a97f8a2b1d2da6ef134f1577846ba713 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/playback')
-rw-r--r--src/multimedia/playback/qmediaplayer.h4
-rw-r--r--src/multimedia/playback/qmediaplaylist.h10
-rw-r--r--src/multimedia/playback/qplaylistfileparser.cpp2
3 files changed, 8 insertions, 8 deletions
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);
diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h
index b16e734f8..4eb93bd02 100644
--- a/src/multimedia/playback/qmediaplaylist.h
+++ b/src/multimedia/playback/qmediaplaylist.h
@@ -67,7 +67,7 @@ public:
enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Sequential, Loop, Random };
enum Error { NoError, FormatError, FormatNotSupportedError, NetworkError, AccessDeniedError };
- explicit QMediaPlaylist(QObject *parent = Q_NULLPTR);
+ explicit QMediaPlaylist(QObject *parent = nullptr);
virtual ~QMediaPlaylist();
QMediaObject *mediaObject() const override;
@@ -96,11 +96,11 @@ public:
bool removeMedia(int start, int end);
bool clear();
- void load(const QNetworkRequest &request, const char *format = Q_NULLPTR);
- void load(const QUrl &location, const char *format = Q_NULLPTR);
- void load(QIODevice *device, const char *format = Q_NULLPTR);
+ void load(const QNetworkRequest &request, const char *format = nullptr);
+ void load(const QUrl &location, const char *format = nullptr);
+ void load(QIODevice *device, const char *format = nullptr);
- bool save(const QUrl &location, const char *format = Q_NULLPTR);
+ bool save(const QUrl &location, const char *format = nullptr);
bool save(QIODevice * device, const char *format);
Error error() const;
diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp
index d0617d2cf..252e1d3ae 100644
--- a/src/multimedia/playback/qplaylistfileparser.cpp
+++ b/src/multimedia/playback/qplaylistfileparser.cpp
@@ -551,7 +551,7 @@ void QPlaylistFileParser::start(const QNetworkRequest& request, const QString &m
if (!d->m_currentParser.isNull()) {
abort();
- d->m_pendingJob = { Q_NULLPTR, QMediaResource(request, mimeType) };
+ d->m_pendingJob = { nullptr, QMediaResource(request, mimeType) };
return;
}