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/radio/qradiodata.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/radio/qradiodata.cpp')
-rw-r--r-- | src/multimedia/radio/qradiodata.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp index 9ed6cb522..d71488b52 100644 --- a/src/multimedia/radio/qradiodata.cpp +++ b/src/multimedia/radio/qradiodata.cpp @@ -95,14 +95,14 @@ public: }; QRadioDataPrivate::QRadioDataPrivate() - : mediaObject(0) - , control(0) + : mediaObject(nullptr) + , control(nullptr) {} void QRadioDataPrivate::_q_serviceDestroyed() { - mediaObject = 0; - control = 0; + mediaObject = nullptr; + control = nullptr; } /*! @@ -211,8 +211,8 @@ bool QRadioData::setMediaObject(QMediaObject *mediaObject) } // without QRadioDataControl discard the media object - d->mediaObject = 0; - d->control = 0; + d->mediaObject = nullptr; + d->control = nullptr; return false; } @@ -228,7 +228,7 @@ QMultimedia::AvailabilityStatus QRadioData::availability() const { Q_D(const QRadioData); - if (d->control == 0) + if (d->control == nullptr) return QMultimedia::ServiceMissing; return d->mediaObject->availability(); @@ -244,7 +244,7 @@ QString QRadioData::stationId() const { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->stationId(); return QString(); } @@ -259,7 +259,7 @@ QRadioData::ProgramType QRadioData::programType() const { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->programType(); return QRadioData::Undefined; @@ -275,7 +275,7 @@ QString QRadioData::programTypeName() const { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->programTypeName(); return QString(); } @@ -290,7 +290,7 @@ QString QRadioData::stationName() const { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->stationName(); return QString(); } @@ -305,7 +305,7 @@ QString QRadioData::radioText() const { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->radioText(); return QString(); } @@ -320,7 +320,7 @@ bool QRadioData::isAlternativeFrequenciesEnabled() const { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->isAlternativeFrequenciesEnabled(); return false; } @@ -329,7 +329,7 @@ void QRadioData::setAlternativeFrequenciesEnabled( bool enabled ) { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->setAlternativeFrequenciesEnabled(enabled); } @@ -343,7 +343,7 @@ QRadioData::Error QRadioData::error() const { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->error(); return QRadioData::ResourceError; } @@ -357,7 +357,7 @@ QString QRadioData::errorString() const { Q_D(const QRadioData); - if (d->control != 0) + if (d->control != nullptr) return d->control->errorString(); return QString(); } |