diff options
author | Jochen Seemann <seemann.jochen@gmail.com> | 2018-07-22 19:52:19 +0200 |
---|---|---|
committer | Jochen Seemann <seemann.jochen@gmail.com> | 2019-01-04 22:22:35 +0000 |
commit | 4e735ae42aca5c6957d8cf57d6858322569b794a (patch) | |
tree | e98bdf4d81ef199f62d7fdce62c7b8d74e73e3dc /src/multimedia/recording/qmediarecorder.cpp | |
parent | 2403f8dc6f1f72bab326025a78b98ec5f81a3d34 (diff) |
multimedia: modernize by using nullptr
Change-Id: Id1084fec084b972aaa1d2389ee56ee831a821172
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/multimedia/recording/qmediarecorder.cpp')
-rw-r--r-- | src/multimedia/recording/qmediarecorder.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 3bab3dada..2b7729481 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -89,15 +89,15 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterMediaRecorderMetaTypes) QMediaRecorderPrivate::QMediaRecorderPrivate(): - mediaObject(0), - control(0), - formatControl(0), - audioControl(0), - videoControl(0), - metaDataControl(0), - availabilityControl(0), + mediaObject(nullptr), + control(nullptr), + formatControl(nullptr), + audioControl(nullptr), + videoControl(nullptr), + metaDataControl(nullptr), + availabilityControl(nullptr), settingsChanged(false), - notifyTimer(0), + notifyTimer(nullptr), state(QMediaRecorder::StoppedState), error(QMediaRecorder::NoError) { @@ -135,13 +135,13 @@ void QMediaRecorderPrivate::_q_error(int error, const QString &errorString) void QMediaRecorderPrivate::_q_serviceDestroyed() { - mediaObject = 0; - control = 0; - formatControl = 0; - audioControl = 0; - videoControl = 0; - metaDataControl = 0; - availabilityControl = 0; + mediaObject = nullptr; + control = nullptr; + formatControl = nullptr; + audioControl = nullptr; + videoControl = nullptr; + metaDataControl = nullptr; + availabilityControl = nullptr; settingsChanged = true; } @@ -328,12 +328,12 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) } } - d->control = 0; - d->formatControl = 0; - d->audioControl = 0; - d->videoControl = 0; - d->metaDataControl = 0; - d->availabilityControl = 0; + d->control = nullptr; + d->formatControl = nullptr; + d->audioControl = nullptr; + d->videoControl = nullptr; + d->metaDataControl = nullptr; + d->availabilityControl = nullptr; d->mediaObject = object; @@ -407,7 +407,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) } } - d->mediaObject = 0; + d->mediaObject = nullptr; return false; } @@ -453,7 +453,7 @@ bool QMediaRecorder::isAvailable() const */ QMultimedia::AvailabilityStatus QMediaRecorder::availability() const { - if (d_func()->control == NULL) + if (d_func()->control == nullptr) return QMultimedia::ServiceMissing; if (d_func()->availabilityControl) |