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/multimediawidgets/qvideowidget_p.h | |
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/multimediawidgets/qvideowidget_p.h')
-rw-r--r-- | src/multimediawidgets/qvideowidget_p.h | 45 |
1 files changed, 13 insertions, 32 deletions
diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index ef417b222..07912ee90 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -222,40 +222,21 @@ class QVideoWidgetPrivate { Q_DECLARE_PUBLIC(QVideoWidget) public: - QVideoWidgetPrivate() - : q_ptr(0) - , mediaObject(0) - , service(0) - , widgetBackend(0) - , windowBackend(0) - , rendererBackend(0) - , currentControl(0) - , currentBackend(0) - , brightness(0) - , contrast(0) - , hue(0) - , saturation(0) - , aspectRatioMode(Qt::KeepAspectRatio) - , nonFullScreenFlags(0) - , wasFullScreen(false) - { - } - - QVideoWidget *q_ptr; + QVideoWidget *q_ptr = nullptr; QPointer<QMediaObject> mediaObject; - QMediaService *service; - QVideoWidgetControlBackend *widgetBackend; - QWindowVideoWidgetBackend *windowBackend; - QRendererVideoWidgetBackend *rendererBackend; - QVideoWidgetControlInterface *currentControl; - QVideoWidgetBackend *currentBackend; - int brightness; - int contrast; - int hue; - int saturation; - Qt::AspectRatioMode aspectRatioMode; + QMediaService *service = nullptr; + QVideoWidgetControlBackend *widgetBackend = nullptr; + QWindowVideoWidgetBackend *windowBackend = nullptr; + QRendererVideoWidgetBackend *rendererBackend = nullptr; + QVideoWidgetControlInterface *currentControl = nullptr; + QVideoWidgetBackend *currentBackend = nullptr; + int brightness = 0; + int contrast = 0; + int hue = 0; + int saturation = 0; + Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio; Qt::WindowFlags nonFullScreenFlags; - bool wasFullScreen; + bool wasFullScreen = false; bool createWidgetBackend(); bool createWindowBackend(); |