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>

10 files changed, 33 insertions, 33 deletions

diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 9323c5836..3907e4287 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -1500,9 +1500,9 @@ QList<QVideoFrame::PixelFormat> TestVideoSurface::supportedPixelFormats(
 {
     if (handleType == QAbstractVideoBuffer::NoHandle) {
         return m_supported;
-    } else {
-        return QList<QVideoFrame::PixelFormat>();
     }
+
+    return QList<QVideoFrame::PixelFormat>();
 }
 
 bool TestVideoSurface::start(const QVideoSurfaceFormat &format)
diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index ea05f116a..ec024f949 100644
--- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -224,10 +224,10 @@ public:
     {
         if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
             return playerControl;
-        else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0)
+        if (qstrcmp(name, QMetaDataReaderControl_iid) == 0)
             return metaDataControl;
-        else
-            return nullptr;
+
+        return nullptr;
     }
 
     void releaseControl(QMediaControl *) override {}
diff --git a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
index ecf89eaed..3a1b614b7 100644
--- a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
+++ b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
@@ -106,12 +106,11 @@ public:
     QMediaControl *requestControl(const char *name) override
     {
         if (qstrcmp(name, QVideoRendererControl_iid) == 0 && rendererControl) {
-            rendererRef += 1;
-
+            ++rendererRef;
             return rendererControl;
-        } else {
-            return nullptr;
         }
+
+        return nullptr;
     }
 
     void releaseControl(QMediaControl *control) override
@@ -119,7 +118,7 @@ public:
         Q_ASSERT(control);
 
         if (control == rendererControl) {
-            rendererRef -= 1;
+            --rendererRef;
 
             if (rendererRef == 0)
                 rendererControl->setSurface(nullptr);
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
index c4e847ab4..7ad167221 100644
--- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
+++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
@@ -55,8 +55,8 @@ public:
     {
         if (hasMetaData && qstrcmp(iid, QMetaDataReaderControl_iid) == 0)
             return &metaData;
-        else
-            return nullptr;
+
+        return nullptr;
     }
 
     void releaseControl(QMediaControl *) override
diff --git a/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp
index e20b0f8ec..d9f09d8a4 100644
--- a/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp
+++ b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp
@@ -99,19 +99,20 @@ public:
     {
         if (strcmp(name, QtTestMediaControlA_iid) == 0) {
             refA += 1;
-
             return &controlA;
-        } else if (strcmp(name, QtTestMediaControlB_iid) == 0) {
-            refB += 1;
+        }
 
+        if (strcmp(name, QtTestMediaControlB_iid) == 0) {
+            refB += 1;
             return &controlB;
-        } else if (strcmp(name, QtTestMediaControlC_iid) == 0) {
-            refA += 1;
+        }
 
+        if (strcmp(name, QtTestMediaControlC_iid) == 0) {
+            refA += 1;
             return &controlA;
-        } else {
-            return nullptr;
         }
+
+        return nullptr;
     }
 
     //releaseControl() pure virtual function of QMediaService class.
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.cpp
index e7fe82075..fd920ce73 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.cpp
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.cpp
@@ -47,8 +47,8 @@ public:
     {
         if (keys().contains(key))
             return new MockMediaService("MockServicePlugin1");
-        else
-            return nullptr;
+
+        return nullptr;
     }
 
     void release(QMediaService *service) override
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp
index 221c02cf0..a0e9f61ab 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp
@@ -48,8 +48,8 @@ public:
     {
         if (keys().contains(key))
             return new MockMediaService("MockServicePlugin2");
-        else
-            return nullptr;
+
+        return nullptr;
     }
 
     void release(QMediaService *service) override
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.cpp
index 5b29c6327..4c1978203 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.cpp
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.cpp
@@ -49,8 +49,8 @@ public:
     {
         if (keys().contains(key))
             return new MockMediaService("MockServicePlugin3");
-        else
-            return nullptr;
+
+        return nullptr;
     }
 
     void release(QMediaService *service) override
@@ -85,8 +85,8 @@ public:
     {
         if (devices(service).contains(device))
             return QString(device)+" description";
-        else
-            return QString();
+
+        return QString();
     }
 };
 
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp
index b4b08993f..e56667550 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp
@@ -48,8 +48,8 @@ public:
     {
         if (keys().contains(key))
             return new MockMediaService("MockServicePlugin4");
-        else
-            return nullptr;
+
+        return nullptr;
     }
 
     void release(QMediaService *service) override
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.cpp
index 7a28b098a..1fafb901a 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.cpp
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.cpp
@@ -46,8 +46,8 @@ public:
     {
         if (keys().contains(key))
             return new MockMediaService("MockServicePlugin5");
-        else
-            return nullptr;
+
+        return nullptr;
     }
 
     void release(QMediaService *service) override
@@ -76,8 +76,8 @@ public:
     {
         if (devices(service).contains(device))
             return QString(device)+" description";
-        else
-            return QString();
+
+        return QString();
     }
 };