diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 13:17:46 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 15:25:03 +0100 |
commit | 65c9fe1cb69dc65ddd413700ab8494409c63c3dc (patch) | |
tree | 6985546e06d56dfdd6e10299b00d2caddf3e7edc /src/multimedia | |
parent | 5c0cca78f410e8a89d3216aeba916d73070398f4 (diff) |
Avoid initializing QFlags with 0 or nullptr
It is being deprecated.
Change-Id: I26b871fe9b989972ab1d2c18de344dc9c9275e9f
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qmediaserviceprovider.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index e8bb352f7..9b51bcddf 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -556,7 +556,7 @@ static QMediaService *playerService(QMediaPlayer::Flags flags) { QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); if (flags) { - QMediaServiceProviderHint::Features features = 0; + QMediaServiceProviderHint::Features features; if (flags & QMediaPlayer::LowLatency) features |= QMediaServiceProviderHint::LowLatencyPlayback; diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index d8ffe42ae..93b560d8c 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -56,7 +56,7 @@ class QMediaServiceProviderHintPrivate : public QSharedData { public: QMediaServiceProviderHintPrivate(QMediaServiceProviderHint::Type type) - :type(type), cameraPosition(QCamera::UnspecifiedPosition), features(nullptr) + : type(type) { } @@ -77,7 +77,7 @@ public: QMediaServiceProviderHint::Type type; QByteArray device; - QCamera::Position cameraPosition; + QCamera::Position cameraPosition = QCamera::UnspecifiedPosition; QString mimeType; QStringList codecs; QMediaServiceProviderHint::Features features; @@ -712,7 +712,7 @@ QMediaServiceProviderHint::Features QMediaServiceProvider::supportedFeatures(con { Q_UNUSED(service); - return QMediaServiceProviderHint::Features(nullptr); + return {}; } /*! |