summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-12-23 10:03:12 +0100
committerLars Knoll <lars.knoll@qt.io>2021-01-21 19:55:52 +0000
commit1175c3b5405015a27bc28d836e96582f02d3ce00 (patch)
tree9d466f156414b29b4264acf748860283ec96c499 /src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
parent083d12af7be12a6076e1be779452909f37262a61 (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/qtmultimediaquicktools/qdeclarativevideooutput.cpp')
-rw-r--r--src/qtmultimediaquicktools/qdeclarativevideooutput.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
index 2051f7c73..f8b6bc0a4 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
@@ -134,7 +134,7 @@ QDeclarativeVideoOutput::QDeclarativeVideoOutput(QQuickItem *parent) :
m_geometryDirty(true),
m_orientation(0),
m_autoOrientation(false),
- m_screenOrientationHandler(0)
+ m_screenOrientationHandler(nullptr)
{
initResource();
setFlag(ItemHasContents, true);
@@ -186,8 +186,8 @@ void QDeclarativeVideoOutput::setSource(QObject *source)
return;
if (m_source && m_sourceType == MediaObjectSource) {
- disconnect(m_source.data(), 0, this, SLOT(_q_updateMediaObject()));
- disconnect(m_source.data(), 0, this, SLOT(_q_updateCameraInfo()));
+ disconnect(m_source.data(), nullptr, this, SLOT(_q_updateMediaObject()));
+ disconnect(m_source.data(), nullptr, this, SLOT(_q_updateCameraInfo()));
}
if (m_backend)
@@ -206,7 +206,7 @@ void QDeclarativeVideoOutput::setSource(QObject *source)
QMetaMethod method = mediaObjectProperty.notifySignal();
QMetaObject::connect(m_source.data(), method.methodIndex(),
this, this->metaObject()->indexOfSlot("_q_updateMediaObject()"),
- Qt::DirectConnection, 0);
+ Qt::DirectConnection, nullptr);
}
@@ -218,7 +218,7 @@ void QDeclarativeVideoOutput::setSource(QObject *source)
QMetaMethod method = deviceIdProperty.notifySignal();
QMetaObject::connect(m_source.data(), method.methodIndex(),
this, this->metaObject()->indexOfSlot("_q_updateCameraInfo()"),
- Qt::DirectConnection, 0);
+ Qt::DirectConnection, nullptr);
}
}
@@ -291,7 +291,7 @@ bool QDeclarativeVideoOutput::createBackend(QMediaService *service)
void QDeclarativeVideoOutput::_q_updateMediaObject()
{
- QMediaObject *mediaObject = 0;
+ QMediaObject *mediaObject = nullptr;
if (m_source)
mediaObject = qobject_cast<QMediaObject*>(m_source.data()->property("mediaObject").value<QObject*>());
@@ -547,7 +547,7 @@ void QDeclarativeVideoOutput::setAutoOrientation(bool autoOrientation)
disconnect(m_screenOrientationHandler, SIGNAL(orientationChanged(int)),
this, SLOT(_q_screenOrientationChanged(int)));
m_screenOrientationHandler->deleteLater();
- m_screenOrientationHandler = 0;
+ m_screenOrientationHandler = nullptr;
}
emit autoOrientationChanged();
@@ -809,7 +809,7 @@ QSGNode *QDeclarativeVideoOutput::updatePaintNode(QSGNode *oldNode, UpdatePaintN
_q_updateGeometry();
if (!m_backend)
- return 0;
+ return nullptr;
return m_backend->updatePaintNode(oldNode, data);
}