summaryrefslogtreecommitdiffstats
path: root/src/multimedia/recording/qmediarecorder.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-02 15:19:22 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 16:34:50 +0000
commit3198bf4944edd8f25996c2b4c4516f606165af59 (patch)
treec2888fd047c61687b2e65748a62e208b31d5c088 /src/multimedia/recording/qmediarecorder.h
parentd2d0d93f7654fdcca118dd17a745e560d524496b (diff)
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 <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/multimedia/recording/qmediarecorder.h')
-rw-r--r--src/multimedia/recording/qmediarecorder.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index 6f275b305..71e8ab5cf 100644
--- a/src/multimedia/recording/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
@@ -100,7 +100,7 @@ public:
OutOfSpaceError
};
- QMediaRecorder(QMediaObject *mediaObject, QObject *parent = 0);
+ explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR);
~QMediaRecorder();
QMediaObject *mediaObject() const;
@@ -131,16 +131,16 @@ public:
QString audioCodecDescription(const QString &codecName) const;
QList<int> supportedAudioSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(),
- bool *continuous = 0) const;
+ bool *continuous = Q_NULLPTR) const;
QStringList supportedVideoCodecs() const;
QString videoCodecDescription(const QString &codecName) const;
QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(),
- bool *continuous = 0) const;
+ bool *continuous = Q_NULLPTR) const;
QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(),
- bool *continuous = 0) const;
+ bool *continuous = Q_NULLPTR) const;
QAudioEncoderSettings audioSettings() const;
QVideoEncoderSettings videoSettings() const;
@@ -187,7 +187,7 @@ Q_SIGNALS:
void availabilityChanged(QMultimedia::AvailabilityStatus availability);
protected:
- QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0);
+ QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = Q_NULLPTR);
bool setMediaObject(QMediaObject *object);
QMediaRecorderPrivate *d_ptr;