From 3198bf4944edd8f25996c2b4c4516f606165af59 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 2 Mar 2016 15:19:22 +0100 Subject: Add explicit and make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Cleaned up placement of * and & in parameters as a drive-by. Added explicit where it was missing as a drive-by. This is not a source-incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: If81ed0c71393aee21d347f5ade4bf3fcc07cd82f Reviewed-by: Yoann Lopes --- src/multimedia/playback/qmediaplayer.h | 8 ++++---- src/multimedia/playback/qmediaplaylist.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/multimedia/playback') diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 437bf58ad..30a08f88b 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -113,13 +113,13 @@ public: MediaIsPlaylist }; - QMediaPlayer(QObject *parent = 0, Flags flags = 0); + explicit QMediaPlayer(QObject *parent = Q_NULLPTR, Flags flags = Flags()); ~QMediaPlayer(); static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList(), - Flags flags = 0); - static QStringList supportedMimeTypes(Flags flags = 0); + Flags flags = Flags()); + static QStringList supportedMimeTypes(Flags flags = Flags()); void setVideoOutput(QVideoWidget *); void setVideoOutput(QGraphicsVideoItem *); @@ -168,7 +168,7 @@ public Q_SLOTS: void setPlaybackRate(qreal rate); - void setMedia(const QMediaContent &media, QIODevice *stream = 0); + void setMedia(const QMediaContent &media, QIODevice *stream = Q_NULLPTR); void setPlaylist(QMediaPlaylist *playlist); void setNetworkConfigurations(const QList &configurations); diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index 1388ac10f..3b6551ead 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -61,7 +61,7 @@ public: enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Sequential, Loop, Random }; enum Error { NoError, FormatError, FormatNotSupportedError, NetworkError, AccessDeniedError }; - QMediaPlaylist(QObject *parent = 0); + explicit QMediaPlaylist(QObject *parent = Q_NULLPTR); virtual ~QMediaPlaylist(); QMediaObject *mediaObject() const; @@ -89,11 +89,11 @@ public: bool removeMedia(int start, int end); bool clear(); - void load(const QNetworkRequest &request, const char *format = 0); - void load(const QUrl &location, const char *format = 0); - void load(QIODevice * device, const char *format = 0); + 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); - bool save(const QUrl &location, const char *format = 0); + bool save(const QUrl &location, const char *format = Q_NULLPTR); bool save(QIODevice * device, const char *format); Error error() const; -- cgit v1.2.3