diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-24 23:54:59 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-27 08:06:15 +0000 |
commit | acc49e582abf76c962851f53cbd66134812f6a1f (patch) | |
tree | ba82ce531f711397af949ac62fa9b0ca06158c11 /src/multimedia/recording | |
parent | 97009b6470c09b9889870873a5c82a6a0bb565f8 (diff) |
Replace Q_NULLPTR with nullptr
Change-Id: I3b7601b4a97f8a2b1d2da6ef134f1577846ba713
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/recording')
-rw-r--r-- | src/multimedia/recording/qaudiorecorder.h | 2 | ||||
-rw-r--r-- | src/multimedia/recording/qmediarecorder.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h index 75f95d354..e57794b40 100644 --- a/src/multimedia/recording/qaudiorecorder.h +++ b/src/multimedia/recording/qaudiorecorder.h @@ -62,7 +62,7 @@ class Q_MULTIMEDIA_EXPORT QAudioRecorder : public QMediaRecorder Q_OBJECT Q_PROPERTY(QString audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged) public: - explicit QAudioRecorder(QObject *parent = Q_NULLPTR); + explicit QAudioRecorder(QObject *parent = nullptr); ~QAudioRecorder(); QStringList audioInputs() const; diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index a12bcd632..0fdcf80e4 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -106,7 +106,7 @@ public: OutOfSpaceError }; - explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); + explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = nullptr); ~QMediaRecorder(); QMediaObject *mediaObject() const override; @@ -137,16 +137,16 @@ public: QString audioCodecDescription(const QString &codecName) const; QList<int> supportedAudioSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), - bool *continuous = Q_NULLPTR) const; + bool *continuous = nullptr) const; QStringList supportedVideoCodecs() const; QString videoCodecDescription(const QString &codecName) const; QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = Q_NULLPTR) const; + bool *continuous = nullptr) const; QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = Q_NULLPTR) const; + bool *continuous = nullptr) const; QAudioEncoderSettings audioSettings() const; QVideoEncoderSettings videoSettings() const; @@ -193,7 +193,7 @@ Q_SIGNALS: void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: - QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); + QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = nullptr); bool setMediaObject(QMediaObject *object) override; QMediaRecorderPrivate *d_ptr; |