Coding style cleanups

Do some coding style fixes proposed by clang-tidy.

Change-Id: I62584767fd7af2f98ac02653c1105d64188f5554
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

5 files changed, 26 insertions, 28 deletions

diff --git a/src/gsttools/qgstreamerplayercontrol.cpp b/src/gsttools/qgstreamerplayercontrol.cpp
index 81e2eb6c4..8ad2e0e93 100644
--- a/src/gsttools/qgstreamerplayercontrol.cpp
+++ b/src/gsttools/qgstreamerplayercontrol.cpp
@@ -101,10 +101,10 @@ QMediaPlayer::MediaStatus QGstreamerPlayerControl::mediaStatus() const
 
 int QGstreamerPlayerControl::bufferStatus() const
 {
-    if (m_bufferProgress == -1) {
+    if (m_bufferProgress == -1)
         return m_session->state() == QMediaPlayer::StoppedState ? 0 : 100;
-    } else
-        return m_bufferProgress;
+
+    return m_bufferProgress;
 }
 
 int QGstreamerPlayerControl::volume() const
diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp
index 4e21846e1..2729097b5 100644
--- a/src/gsttools/qgstreamerplayersession.cpp
+++ b/src/gsttools/qgstreamerplayersession.cpp
@@ -1463,17 +1463,16 @@ void QGstreamerPlayerSession::playbinNotifySource(GObject *o, GParamSpec *p, gpo
         for (const QByteArray &rawHeader : rawHeaderList) {
             if (rawHeader == userAgentString) // Filter User-Agent
                 continue;
-            else {
-                GValue headerValue;
 
-                memset(&headerValue, 0, sizeof(GValue));
-                g_value_init(&headerValue, G_TYPE_STRING);
+            GValue headerValue;
 
-                g_value_set_string(&headerValue,
-                                   self->m_request.rawHeader(rawHeader).constData());
+            memset(&headerValue, 0, sizeof(GValue));
+            g_value_init(&headerValue, G_TYPE_STRING);
 
-                gst_structure_set_value(extras, rawHeader.constData(), &headerValue);
-            }
+            g_value_set_string(&headerValue,
+                               self->m_request.rawHeader(rawHeader).constData());
+
+            gst_structure_set_value(extras, rawHeader.constData(), &headerValue);
         }
 
         if (gst_structure_n_fields(extras) > 0)
diff --git a/src/gsttools/qgstreamervideooverlay.cpp b/src/gsttools/qgstreamervideooverlay.cpp
index 3cf8c61d6..df3229736 100644
--- a/src/gsttools/qgstreamervideooverlay.cpp
+++ b/src/gsttools/qgstreamervideooverlay.cpp
@@ -55,7 +55,7 @@ struct ElementMap
 };
 
 // Ordered by descending priority
-static const ElementMap elementMap[] =
+static constexpr ElementMap elementMap[] =
 {
 #if QT_CONFIG(gstreamer_gl)
     { "xcb", "glimagesink" },
@@ -340,13 +340,13 @@ static GstElement *findBestVideoSink()
         return 0;
 
     // First, try some known video sinks, depending on the Qt platform plugin in use.
-    for (quint32 i = 0; i < (sizeof(elementMap) / sizeof(ElementMap)); ++i) {
+    for (auto i : elementMap) {
 #if QT_CONFIG(gstreamer_gl)
-        if (!QGstUtils::useOpenGL() && qstrcmp(elementMap[i].gstreamerElement, "glimagesink") == 0)
+        if (!QGstUtils::useOpenGL() && qstrcmp(i.gstreamerElement, "glimagesink") == 0)
             continue;
 #endif
-        if (platform == QLatin1String(elementMap[i].qtPlatform)
-                && (choice = gst_element_factory_make(elementMap[i].gstreamerElement, nullptr))) {
+        if (platform == QLatin1String(i.qtPlatform)
+                && (choice = gst_element_factory_make(i.gstreamerElement, nullptr))) {
 
             if (qt_gst_element_is_functioning(choice))
                 return choice;
diff --git a/src/gsttools/qgstvideobuffer.cpp b/src/gsttools/qgstvideobuffer.cpp
index 699fcb348..49c8efaed 100644
--- a/src/gsttools/qgstvideobuffer.cpp
+++ b/src/gsttools/qgstvideobuffer.cpp
@@ -78,9 +78,10 @@ int QGstVideoBuffer::map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar
     const GstMapFlags flags = GstMapFlags(((mode & ReadOnly) ? GST_MAP_READ : 0)
                 | ((mode & WriteOnly) ? GST_MAP_WRITE : 0));
 
-    if (mode == NotMapped || m_mode != NotMapped) {
+    if (mode == NotMapped || m_mode != NotMapped)
         return 0;
-    } else if (m_videoInfo.finfo->n_planes == 0) {         // Encoded
+
+    if (m_videoInfo.finfo->n_planes == 0) {         // Encoded
         if (gst_buffer_map(m_buffer, &m_frame.map[0], flags)) {
             if (numBytes)
                 *numBytes = m_frame.map[0].size;
diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp
index f282fd751..0f930cf02 100644
--- a/src/gsttools/qgstvideorenderersink.cpp
+++ b/src/gsttools/qgstvideorenderersink.cpp
@@ -285,9 +285,9 @@ bool QVideoSurfaceGstDelegate::proposeAllocation(GstQuery *query)
         locker.unlock();
 
         return pool->proposeAllocation(query);
-    } else {
-        return false;
     }
+
+    return false;
 }
 
 void QVideoSurfaceGstDelegate::flush()
@@ -431,9 +431,9 @@ bool QVideoSurfaceGstDelegate::event(QEvent *event)
             m_notified = false;
         }
         return true;
-    } else {
-        return QObject::event(event);
     }
+
+    return QObject::event(event);
 }
 
 bool QVideoSurfaceGstDelegate::handleEvent(QMutexLocker<QMutex> *locker)
@@ -527,11 +527,11 @@ bool QVideoSurfaceGstDelegate::waitForAsyncEvent(
         m_notified = false;
 
         return true;
-    } else {
-        notify();
-
-        return condition->wait(&m_mutex, time);
     }
+
+    notify();
+
+    return condition->wait(&m_mutex, time);
 }
 
 void QVideoSurfaceGstDelegate::updateSupportedFormats()
@@ -554,8 +554,6 @@ void QVideoSurfaceGstDelegate::updateSupportedFormats()
             m_renderer = pool;
             m_surfaceCaps = caps;
             break;
-        } else {
-            gst_caps_unref(caps);
         }
     }
 }