DirectShow: Clang warnings about else after return, break

Disentangle code of DirectShowPlayerService::requestControl().

Change-Id: I2e90d5c86acdbe2f20f421f43929e0e9c5580eaf
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
 

5 files changed, 24 insertions, 25 deletions

diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index f69c0d624..4c9100282 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -784,13 +784,9 @@ bool DSCameraSession::createFilterGraph()
                                                     reinterpret_cast<void**>(&m_sourceFilter));
                         pPropBag->Release();
                         pMoniker->Release();
-                        if (SUCCEEDED(hr)) {
+                        if (SUCCEEDED(hr))
                             break; // done, stop looping through
-                        }
-                        else
-                        {
-                            qWarning() << "Object bind failed";
-                        }
+                        qWarning("Object bind failed");
                     }
                 }
             }
diff --git a/src/plugins/directshow/common/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp
index 2792dc3c6..b792c4d3f 100644
--- a/src/plugins/directshow/common/directshowbasefilter.cpp
+++ b/src/plugins/directshow/common/directshowbasefilter.cpp
@@ -75,9 +75,8 @@ HRESULT DirectShowBaseFilter::NotifyEvent(long eventCode, LONG_PTR eventParam1,
             eventParam2 = (LONG_PTR)(IBaseFilter*)this;
 
         return sink->Notify(eventCode, eventParam1, eventParam2);
-    } else {
-        return E_NOTIMPL;
     }
+    return E_NOTIMPL;
 }
 
 HRESULT DirectShowBaseFilter::Run(REFERENCE_TIME tStart)
diff --git a/src/plugins/directshow/common/directshowsamplegrabber.cpp b/src/plugins/directshow/common/directshowsamplegrabber.cpp
index fec59b538..5744aea16 100644
--- a/src/plugins/directshow/common/directshowsamplegrabber.cpp
+++ b/src/plugins/directshow/common/directshowsamplegrabber.cpp
@@ -82,7 +82,8 @@ public:
             AddRef();
             *ppvObject = static_cast<IUnknown *>(this);
             return S_OK;
-        } else if (riid == IID_ISampleGrabberCB /*__uuidof(ISampleGrabberCB)*/ ) {
+        }
+        if (riid == IID_ISampleGrabberCB /*__uuidof(ISampleGrabberCB)*/ ) {
             AddRef();
             *ppvObject = static_cast<ISampleGrabberCB *>(this);
             return S_OK;
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index d5b8bef26..4b57cdcd2 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -200,13 +200,13 @@ DirectShowPlayerService::~DirectShowPlayerService()
 
 QMediaControl *DirectShowPlayerService::requestControl(const char *name)
 {
-    if (qstrcmp(name, QMediaPlayerControl_iid) == 0) {
+    if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
         return m_playerControl;
-    } else if (qstrcmp(name, QAudioOutputSelectorControl_iid) == 0) {
+    if (qstrcmp(name, QAudioOutputSelectorControl_iid) == 0)
         return m_audioEndpointControl;
-    } else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) {
+    if (qstrcmp(name, QMetaDataReaderControl_iid) == 0)
         return m_metaDataControl;
-    } else if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
+    if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
         if (!m_videoRendererControl && !m_videoWindowControl) {
             m_videoRendererControl = new DirectShowVideoRendererControl(m_loop);
 
@@ -215,7 +215,9 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
 
             return m_videoRendererControl;
         }
-    } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
+        return nullptr;
+    }
+    if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
         if (!m_videoRendererControl && !m_videoWindowControl) {
             IBaseFilter *filter{};
 
@@ -239,13 +241,16 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
 
             return m_videoWindowControl;
         }
-    } else if (qstrcmp(name, QMediaAudioProbeControl_iid) == 0) {
+        return nullptr;
+    }
+    if (qstrcmp(name, QMediaAudioProbeControl_iid) == 0) {
         if (!m_audioProbeControl)
             m_audioProbeControl = new DirectShowAudioProbeControl();
         m_audioProbeControl->ref();
         updateAudioProbe();
         return m_audioProbeControl;
-    } else if (qstrcmp(name, QMediaVideoProbeControl_iid) == 0) {
+    }
+    if (qstrcmp(name, QMediaVideoProbeControl_iid) == 0) {
         if (!m_videoProbeControl)
             m_videoProbeControl = new DirectShowVideoProbeControl();
         m_videoProbeControl->ref();
diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp
index 74d59231c..70159d5e3 100644
--- a/src/plugins/directshow/player/videosurfacefilter.cpp
+++ b/src/plugins/directshow/player/videosurfacefilter.cpp
@@ -713,11 +713,10 @@ bool VideoSurfaceFilter::startSurface()
         m_loop->postEvent(this, new QEvent(QEvent::Type(StartSurface)));
         m_waitSurface.wait(&m_mutex);
         return m_surfaceStarted;
-    } else {
-        m_surfaceStarted = m_surface->start(m_surfaceFormat);
-        qCDebug(qLcRenderFilter, "startSurface %s", m_surfaceStarted ? "succeeded" : "failed");
-        return m_surfaceStarted;
     }
+    m_surfaceStarted = m_surface->start(m_surfaceFormat);
+    qCDebug(qLcRenderFilter, "startSurface %s", m_surfaceStarted ? "succeeded" : "failed");
+    return m_surfaceStarted;
 }
 
 void VideoSurfaceFilter::stopSurface()
@@ -741,12 +740,11 @@ bool VideoSurfaceFilter::restartSurface()
         m_loop->postEvent(this, new QEvent(QEvent::Type(RestartSurface)));
         m_waitSurface.wait(&m_mutex);
         return m_surfaceStarted;
-    } else {
-        m_surface->stop();
-        m_surfaceStarted = m_surface->start(m_surfaceFormat);
-        qCDebug(qLcRenderFilter, "restartSurface %s", m_surfaceStarted ? "succeeded" : "failed");
-        return m_surfaceStarted;
     }
+    m_surface->stop();
+    m_surfaceStarted = m_surface->start(m_surfaceFormat);
+    qCDebug(qLcRenderFilter, "restartSurface %s", m_surfaceStarted ? "succeeded" : "failed");
+    return m_surfaceStarted;
 }
 
 void VideoSurfaceFilter::flushSurface()