From 06ab7039e7043b24e18184cd510af07bd2a646d5 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eb@emlix.com>
Date: Tue, 17 Dec 2019 09:47:27 +0100
Subject: gsttools: use auto for variables assigned from qobject_cast<>

Change-Id: Ie81bd5a419665756dbdac5dafddf50fdde61019f
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 src/gsttools/qgstreamerbushelper.cpp     | 8 ++++----
 src/gsttools/qgstreamerplayersession.cpp | 4 +---
 src/gsttools/qgstvideorenderersink.cpp   | 6 +++---
 src/gsttools/qvideosurfacegstsink.cpp    | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/gsttools/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp
index 5df046fde..b2017aed9 100644
--- a/src/gsttools/qgstreamerbushelper.cpp
+++ b/src/gsttools/qgstreamerbushelper.cpp
@@ -186,27 +186,27 @@ QGstreamerBusHelper::~QGstreamerBusHelper()
 
 void QGstreamerBusHelper::installMessageFilter(QObject *filter)
 {
-    QGstreamerSyncMessageFilter *syncFilter = qobject_cast<QGstreamerSyncMessageFilter*>(filter);
+    auto syncFilter = qobject_cast<QGstreamerSyncMessageFilter*>(filter);
     if (syncFilter) {
         QMutexLocker lock(&d->filterMutex);
         if (!d->syncFilters.contains(syncFilter))
             d->syncFilters.append(syncFilter);
     }
 
-    QGstreamerBusMessageFilter *busFilter = qobject_cast<QGstreamerBusMessageFilter*>(filter);
+    auto busFilter = qobject_cast<QGstreamerBusMessageFilter*>(filter);
     if (busFilter && !d->busFilters.contains(busFilter))
         d->busFilters.append(busFilter);
 }
 
 void QGstreamerBusHelper::removeMessageFilter(QObject *filter)
 {
-    QGstreamerSyncMessageFilter *syncFilter = qobject_cast<QGstreamerSyncMessageFilter*>(filter);
+    auto syncFilter = qobject_cast<QGstreamerSyncMessageFilter*>(filter);
     if (syncFilter) {
         QMutexLocker lock(&d->filterMutex);
         d->syncFilters.removeAll(syncFilter);
     }
 
-    QGstreamerBusMessageFilter *busFilter = qobject_cast<QGstreamerBusMessageFilter*>(filter);
+    auto busFilter = qobject_cast<QGstreamerBusMessageFilter*>(filter);
     if (busFilter)
         d->busFilters.removeAll(busFilter);
 }
diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp
index ed3f16c5f..19b90a4d3 100644
--- a/src/gsttools/qgstreamerplayersession.cpp
+++ b/src/gsttools/qgstreamerplayersession.cpp
@@ -666,9 +666,7 @@ void QGstreamerPlayerSession::setVideoRenderer(QObject *videoOutput)
         }
     }
 
-    QGstreamerVideoRendererInterface* renderer = qobject_cast<QGstreamerVideoRendererInterface*>(videoOutput);
-
-    m_renderer = renderer;
+    m_renderer = qobject_cast<QGstreamerVideoRendererInterface*>(videoOutput);
     emit rendererChanged();
 
     // No sense to continue if custom pipeline requested.
diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp
index 3b458a978..2e936ce36 100644
--- a/src/gsttools/qgstvideorenderersink.cpp
+++ b/src/gsttools/qgstvideorenderersink.cpp
@@ -170,8 +170,8 @@ QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(QAbstractVideoSurface *surfac
 {
     const auto instances = rendererLoader()->instances(QGstVideoRendererPluginKey);
     for (QObject *instance : instances) {
-        QGstVideoRendererInterface* plugin = qobject_cast<QGstVideoRendererInterface*>(instance);
-        if (QGstVideoRenderer *renderer = plugin ? plugin->createRenderer() : 0)
+        auto plugin = qobject_cast<QGstVideoRendererInterface*>(instance);
+        if (QGstVideoRenderer *renderer = plugin ? plugin->createRenderer() : nullptr)
             m_renderers.append(renderer);
     }
 
@@ -304,7 +304,7 @@ GstFlowReturn QVideoSurfaceGstDelegate::render(GstBuffer *buffer)
 #if QT_CONFIG(gstreamer_gl)
 static GstGLContext *gstGLDisplayContext(QAbstractVideoSurface *surface)
 {
-    QOpenGLContext *glContext = qobject_cast<QOpenGLContext*>(surface->property("GLContext").value<QObject*>());
+    auto glContext = qobject_cast<QOpenGLContext*>(surface->property("GLContext").value<QObject*>());
     // Context is not ready yet.
     if (!glContext)
         return nullptr;
diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp
index c63eea9a6..e3f174292 100644
--- a/src/gsttools/qvideosurfacegstsink.cpp
+++ b/src/gsttools/qvideosurfacegstsink.cpp
@@ -69,7 +69,7 @@ QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(
     if (m_surface) {
         const auto instances = bufferPoolLoader()->instances(QGstBufferPoolPluginKey);
         for (QObject *instance : instances) {
-            QGstBufferPoolInterface* plugin = qobject_cast<QGstBufferPoolInterface*>(instance);
+            auto plugin = qobject_cast<QGstBufferPoolInterface*>(instance);
 
             if (plugin) {
                 m_pools.append(plugin);
-- 
cgit v1.2.3