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/playback/qmediacontent.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/playback/qmediacontent.cpp')
| -rw-r--r-- | src/multimedia/playback/qmediacontent.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/multimedia/playback/qmediacontent.cpp b/src/multimedia/playback/qmediacontent.cpp index bce65ddbc..85ccc35a2 100644 --- a/src/multimedia/playback/qmediacontent.cpp +++ b/src/multimedia/playback/qmediacontent.cpp @@ -253,8 +253,8 @@ QMediaContent& QMediaContent::operator=(const QMediaContent &other) bool QMediaContent::operator==(const QMediaContent &other) const { - return (d.constData() == 0 && other.d.constData() == 0) || - (d.constData() != 0 && other.d.constData() != 0 && + return (d.constData() == 0 && other.d.constData() == nullptr) || + (d.constData() != 0 && other.d.constData() != nullptr && *d.constData() == *other.d.constData()); } @@ -273,7 +273,7 @@ bool QMediaContent::operator!=(const QMediaContent &other) const bool QMediaContent::isNull() const { - return d.constData() == 0; + return d.constData() == nullptr; } /*! @@ -311,7 +311,7 @@ QNetworkRequest QMediaContent::canonicalRequest() const QMediaResource QMediaContent::canonicalResource() const { - return d.constData() != 0 + return d.constData() != nullptr ? d->resources.value(0) : QMediaResource(); } @@ -325,7 +325,7 @@ QMediaResource QMediaContent::canonicalResource() const QMediaResourceList QMediaContent::resources() const { - return d.constData() != 0 + return d.constData() != nullptr ? d->resources : QMediaResourceList(); } @@ -337,9 +337,9 @@ QMediaResourceList QMediaContent::resources() const QMediaPlaylist *QMediaContent::playlist() const { - return d.constData() != 0 + return d.constData() != nullptr ? d->playlist.data() - : 0; + : nullptr; } QT_END_NAMESPACE |