diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:04 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:04 +0200 |
commit | c3ea9be0d49ec1eecda9d07e933d5426ed52670a (patch) | |
tree | 2522225f27fdf1a139b167ea612a5bb016e4eb22 /src/multimedia/playback | |
parent | 11eb454e7f53a5ddc81458b57afe2605c8fa5d4d (diff) | |
parent | d32aff3e0453475c1a22d5e8c7a106df18c0ad10 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ie1331c18854bea488c773807597f8ad209437657
Diffstat (limited to 'src/multimedia/playback')
-rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 8 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylist.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 6babc281e..f8d91b999 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -119,13 +119,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 *); @@ -174,7 +174,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<QNetworkConfiguration> &configurations); diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index 1fa75a24d..05ab8f42e 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 }; - QMediaPlaylist(QObject *parent = 0); + explicit QMediaPlaylist(QObject *parent = Q_NULLPTR); virtual ~QMediaPlaylist(); QMediaObject *mediaObject() const; @@ -96,11 +96,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; |