diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-23 10:03:12 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:55:52 +0000 |
commit | 1175c3b5405015a27bc28d836e96582f02d3ce00 (patch) | |
tree | 9d466f156414b29b4264acf748860283ec96c499 /src/multimediawidgets/qvideowidget.cpp | |
parent | 083d12af7be12a6076e1be779452909f37262a61 (diff) |
Modernize code base
Run clang-tidy over the code base with some code modernization
options.
Change-Id: I9e74d1225bce333e74224e3b92c02c7e9884d8f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/multimediawidgets/qvideowidget.cpp')
-rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index bab1ffbff..29480921c 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -168,7 +168,7 @@ void QRendererVideoWidgetBackend::releaseControl() void QRendererVideoWidgetBackend::clearSurface() { if (m_rendererControl) - m_rendererControl->setSurface(0); + m_rendererControl->setSurface(nullptr); } void QRendererVideoWidgetBackend::setBrightness(int brightness) @@ -461,7 +461,7 @@ void QVideoWidgetPrivate::clearService() QLayout *layout = q_func()->layout(); for (QLayoutItem *item = layout->takeAt(0); item; item = layout->takeAt(0)) { - item->widget()->setParent(0); + item->widget()->setParent(nullptr); delete item; } delete layout; @@ -469,23 +469,23 @@ void QVideoWidgetPrivate::clearService() widgetBackend->releaseControl(); delete widgetBackend; - widgetBackend = 0; + widgetBackend = nullptr; } else if (rendererBackend) { rendererBackend->clearSurface(); rendererBackend->releaseControl(); delete rendererBackend; - rendererBackend = 0; + rendererBackend = nullptr; } else if (windowBackend) { windowBackend->releaseControl(); delete windowBackend; - windowBackend = 0; + windowBackend = nullptr; } - currentBackend = 0; - currentControl = 0; - service = 0; + currentBackend = nullptr; + currentControl = nullptr; + service = nullptr; } } @@ -542,12 +542,12 @@ void QVideoWidgetPrivate::_q_serviceDestroyed() delete windowBackend; delete rendererBackend; - widgetBackend = 0; - windowBackend = 0; - rendererBackend = 0; - currentControl = 0; - currentBackend = 0; - service = 0; + widgetBackend = nullptr; + windowBackend = nullptr; + rendererBackend = nullptr; + currentControl = nullptr; + currentBackend = nullptr; + service = nullptr; } void QVideoWidgetPrivate::_q_brightnessChanged(int b) @@ -683,15 +683,15 @@ bool QVideoWidget::setMediaObject(QMediaObject *object) if (isVisible()) d->rendererBackend->showEvent(); } else { - d->service = 0; - d->mediaObject = 0; + d->service = nullptr; + d->mediaObject = nullptr; return false; } connect(d->service, SIGNAL(destroyed()), SLOT(_q_serviceDestroyed())); } else { - d->mediaObject = 0; + d->mediaObject = nullptr; return false; } @@ -967,7 +967,7 @@ void QVideoWidget::showEvent(QShowEvent *event) d->windowBackend->releaseControl(); delete d->windowBackend; - d->windowBackend = 0; + d->windowBackend = nullptr; d->createRendererBackend(); } |