DirectShow: Fix clang-tidy warnings about else after return

- Unindent the code or replace by switch ()
- Smaller fixups when reindenting (nullptr, use QStringView for
  comparison against wchar_t)

Change-Id: I249cb00b9ebe375b089d8d53b10c2d16d5771680
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

5 files changed, 102 insertions, 137 deletions

diff --git a/src/plugins/directshow/common/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp
index 1e45eea51..2792dc3c6 100644
--- a/src/plugins/directshow/common/directshowbasefilter.cpp
+++ b/src/plugins/directshow/common/directshowbasefilter.cpp
@@ -172,51 +172,43 @@ HRESULT DirectShowBaseFilter::SetSyncSource(IReferenceClock *pClock)
 
 HRESULT DirectShowBaseFilter::GetSyncSource(IReferenceClock **ppClock)
 {
-    if (!ppClock) {
+    if (!ppClock)
         return E_POINTER;
-    } else {
-        if (!m_clock) {
-            *ppClock = 0;
-
-            return S_FALSE;
-        } else {
-            m_clock->AddRef();
 
-            *ppClock = m_clock;
-
-            return S_OK;
-        }
+    if (!m_clock) {
+        *ppClock = nullptr;
+        return S_FALSE;
     }
+    m_clock->AddRef();
+    *ppClock = m_clock;
+    return S_OK;
 }
 
 HRESULT DirectShowBaseFilter::EnumPins(IEnumPins **ppEnum)
 {
-    if (!ppEnum) {
+    if (!ppEnum)
         return E_POINTER;
-    } else {
-        *ppEnum = new DirectShowPinEnum(this);
-        return S_OK;
-    }
+    *ppEnum = new DirectShowPinEnum(this);
+    return S_OK;
 }
 
 HRESULT DirectShowBaseFilter::FindPin(LPCWSTR Id, IPin **ppPin)
 {
-    if (!ppPin || !Id) {
+    if (!ppPin || !Id)
         return E_POINTER;
-    } else {
-        QMutexLocker locker(&m_mutex);
-        const QList<DirectShowPin *> pinList = pins();
-        for (DirectShowPin *pin : pinList) {
-            if (QString::fromWCharArray(Id) == pin->name()) {
-                pin->AddRef();
-                *ppPin = pin;
-                return S_OK;
-            }
-        }
 
-        *ppPin = 0;
-        return VFW_E_NOT_FOUND;
+    QMutexLocker locker(&m_mutex);
+    const QList<DirectShowPin *> pinList = pins();
+    for (DirectShowPin *pin : pinList) {
+        if (pin->name() == QStringView(Id)) {
+            pin->AddRef();
+            *ppPin = pin;
+            return S_OK;
+        }
     }
+
+    *ppPin = 0;
+    return VFW_E_NOT_FOUND;
 }
 
 HRESULT DirectShowBaseFilter::JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pName)
@@ -237,24 +229,23 @@ HRESULT DirectShowBaseFilter::JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pNam
 
 HRESULT DirectShowBaseFilter::QueryFilterInfo(FILTER_INFO *pInfo)
 {
-    if (!pInfo) {
+    if (!pInfo)
         return E_POINTER;
-    } else {
-        QString name = m_filterName;
 
-        if (name.length() >= MAX_FILTER_NAME)
-            name.truncate(MAX_FILTER_NAME - 1);
+    QString name = m_filterName;
 
-        int length = name.toWCharArray(pInfo->achName);
-        pInfo->achName[length] = '\0';
+    if (name.length() >= MAX_FILTER_NAME)
+        name.truncate(MAX_FILTER_NAME - 1);
 
-        if (m_graph)
-            m_graph->AddRef();
+    int length = name.toWCharArray(pInfo->achName);
+    pInfo->achName[length] = '\0';
 
-        pInfo->pGraph = m_graph;
+    if (m_graph)
+        m_graph->AddRef();
 
-        return S_OK;
-    }
+    pInfo->pGraph = m_graph;
+
+    return S_OK;
 }
 
 HRESULT DirectShowBaseFilter::QueryVendorInfo(LPWSTR *pVendorInfo)
diff --git a/src/plugins/directshow/common/directshowmediatype.cpp b/src/plugins/directshow/common/directshowmediatype.cpp
index dc8e598f0..fe86e0204 100644
--- a/src/plugins/directshow/common/directshowmediatype.cpp
+++ b/src/plugins/directshow/common/directshowmediatype.cpp
@@ -250,7 +250,8 @@ QVideoSurfaceFormat DirectShowMediaType::videoFormatFromType(const AM_MEDIA_TYPE
                 format.setScanLineDirection(scanLineDirection(format.pixelFormat(), header->bmiHeader));
 
                 return format;
-            } else if (IsEqualGUID(type->formattype, FORMAT_VideoInfo2)) {
+            }
+            if (IsEqualGUID(type->formattype, FORMAT_VideoInfo2)) {
                 VIDEOINFOHEADER2 *header = reinterpret_cast<VIDEOINFOHEADER2 *>(type->pbFormat);
 
                 QVideoSurfaceFormat format(
diff --git a/src/plugins/directshow/common/directshowmediatypeenum.cpp b/src/plugins/directshow/common/directshowmediatypeenum.cpp
index a6afcd5f1..10623a246 100644
--- a/src/plugins/directshow/common/directshowmediatypeenum.cpp
+++ b/src/plugins/directshow/common/directshowmediatypeenum.cpp
@@ -78,21 +78,20 @@ HRESULT DirectShowMediaTypeEnum::QueryInterface(REFIID riid, void **ppv)
 
 HRESULT DirectShowMediaTypeEnum::Next(ULONG cMediaTypes, AM_MEDIA_TYPE **ppMediaTypes, ULONG *pcFetched)
 {
-    if (ppMediaTypes && (pcFetched || cMediaTypes == 1)) {
-        ULONG count = qBound<ULONG>(0, cMediaTypes, m_mediaTypes.count() - m_index);
-
-        for (ULONG i = 0; i < count; ++i, ++m_index) {
-            ppMediaTypes[i] = reinterpret_cast<AM_MEDIA_TYPE *>(CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)));
-            DirectShowMediaType::copyToUninitialized(ppMediaTypes[i], &m_mediaTypes.at(m_index));
-        }
+    if (!ppMediaTypes || (!pcFetched && cMediaTypes != 1))
+        return E_POINTER;
 
-        if (pcFetched)
-            *pcFetched = count;
+    ULONG count = qBound<ULONG>(0, cMediaTypes, m_mediaTypes.count() - m_index);
 
-        return count == cMediaTypes ? S_OK : S_FALSE;
-    } else {
-        return E_POINTER;
+    for (ULONG i = 0; i < count; ++i, ++m_index) {
+        ppMediaTypes[i] = reinterpret_cast<AM_MEDIA_TYPE *>(CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)));
+        DirectShowMediaType::copyToUninitialized(ppMediaTypes[i], &m_mediaTypes.at(m_index));
     }
+
+    if (pcFetched)
+        *pcFetched = count;
+
+    return count == cMediaTypes ? S_OK : S_FALSE;
 }
 
 HRESULT DirectShowMediaTypeEnum::Skip(ULONG cMediaTypes)
@@ -109,14 +108,9 @@ HRESULT DirectShowMediaTypeEnum::Reset()
 
 HRESULT DirectShowMediaTypeEnum::Clone(IEnumMediaTypes **ppEnum)
 {
-    if (ppEnum) {
-        if (m_pin)
-            *ppEnum = new DirectShowMediaTypeEnum(m_pin);
-        else
-            *ppEnum = new DirectShowMediaTypeEnum(m_mediaTypes);
-        return S_OK;
-    } else {
+    if (!ppEnum)
         return E_POINTER;
-    }
+    *ppEnum = m_pin ? new DirectShowMediaTypeEnum(m_pin) : new DirectShowMediaTypeEnum(m_mediaTypes);
+    return S_OK;
 }
 
diff --git a/src/plugins/directshow/common/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp
index 0dae72d0a..508a9b21d 100644
--- a/src/plugins/directshow/common/directshowpin.cpp
+++ b/src/plugins/directshow/common/directshowpin.cpp
@@ -230,70 +230,60 @@ HRESULT DirectShowPin::Disconnect()
 
 HRESULT DirectShowPin::ConnectedTo(IPin **ppPin)
 {
-    if (!ppPin) {
+    if (!ppPin)
         return E_POINTER;
-    } else {
-        QMutexLocker locker(&m_mutex);
-
-        if (!m_peerPin) {
-            *ppPin = 0;
-            return VFW_E_NOT_CONNECTED;
-        } else {
-            m_peerPin->AddRef();
-            *ppPin = m_peerPin;
-            return S_OK;
-        }
+
+    QMutexLocker locker(&m_mutex);
+    if (!m_peerPin) {
+        *ppPin = 0;
+        return VFW_E_NOT_CONNECTED;
     }
+    m_peerPin->AddRef();
+    *ppPin = m_peerPin;
+    return S_OK;
 }
 
 HRESULT DirectShowPin::ConnectionMediaType(AM_MEDIA_TYPE *pmt)
 {
-    if (!pmt) {
+    if (!pmt)
         return E_POINTER;
-    } else {
-        QMutexLocker locker(&m_mutex);
 
-        if (!m_peerPin) {
-            DirectShowMediaType::init(pmt);
-            return VFW_E_NOT_CONNECTED;
-        } else {
-            DirectShowMediaType::copy(pmt, &m_mediaType);
-            return S_OK;
-        }
+    QMutexLocker locker(&m_mutex);
+    if (!m_peerPin) {
+        DirectShowMediaType::init(pmt);
+        return VFW_E_NOT_CONNECTED;
     }
+    DirectShowMediaType::copy(pmt, &m_mediaType);
+    return S_OK;
 }
 
 HRESULT DirectShowPin::QueryPinInfo(PIN_INFO *pInfo)
 {
-    if (!pInfo) {
+    if (!pInfo)
         return E_POINTER;
-    } else {
-        pInfo->pFilter = m_filter;
-        if (m_filter) {
-            m_filter->AddRef();
-        }
-        pInfo->dir = m_direction;
 
-        QString name = m_name;
-        if (name.length() >= MAX_PIN_NAME)
-            name.truncate(MAX_PIN_NAME - 1);
-        int length = name.toWCharArray(pInfo->achName);
-        pInfo->achName[length] = '\0';
+    pInfo->pFilter = m_filter;
+    if (m_filter)
+        m_filter->AddRef();
+    pInfo->dir = m_direction;
 
-        return S_OK;
-    }
+    QString name = m_name;
+    if (name.length() >= MAX_PIN_NAME)
+        name.truncate(MAX_PIN_NAME - 1);
+    int length = name.toWCharArray(pInfo->achName);
+    pInfo->achName[length] = '\0';
+
+    return S_OK;
 }
 
 HRESULT DirectShowPin::QueryId(LPWSTR *Id)
 {
-    if (!Id) {
+    if (!Id)
         return E_POINTER;
-    } else {
-        const int bytes = (m_name.length() + 1) * 2;
-        *Id = static_cast<LPWSTR>(::CoTaskMemAlloc(bytes));
-        ::memcpy(*Id, m_name.utf16(), bytes);
-        return S_OK;
-    }
+    const int bytes = (m_name.length() + 1) * 2;
+    *Id = static_cast<LPWSTR>(::CoTaskMemAlloc(bytes));
+    ::memcpy(*Id, m_name.utf16(), bytes);
+    return S_OK;
 }
 
 HRESULT DirectShowPin::QueryAccept(const AM_MEDIA_TYPE *pmt)
@@ -309,12 +299,10 @@ HRESULT DirectShowPin::QueryAccept(const AM_MEDIA_TYPE *pmt)
 
 HRESULT DirectShowPin::EnumMediaTypes(IEnumMediaTypes **ppEnum)
 {
-    if (!ppEnum) {
+    if (!ppEnum)
         return E_POINTER;
-    } else {
-        *ppEnum = new DirectShowMediaTypeEnum(this);
-        return S_OK;
-    }
+    *ppEnum = new DirectShowMediaTypeEnum(this);
+    return S_OK;
 }
 
 HRESULT DirectShowPin::QueryInternalConnections(IPin **apPin, ULONG *nPin)
@@ -349,12 +337,10 @@ HRESULT DirectShowPin::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, d
 
 HRESULT DirectShowPin::QueryDirection(PIN_DIRECTION *pPinDir)
 {
-    if (!pPinDir) {
+    if (!pPinDir)
         return E_POINTER;
-    } else {
-        *pPinDir = m_direction;
-        return S_OK;
-    }
+    *pPinDir = m_direction;
+    return S_OK;
 }
 
 QList<DirectShowMediaType> DirectShowPin::supportedMediaTypes()
diff --git a/src/plugins/directshow/common/directshowpinenum.cpp b/src/plugins/directshow/common/directshowpinenum.cpp
index e0ab58d19..20fa93d6e 100644
--- a/src/plugins/directshow/common/directshowpinenum.cpp
+++ b/src/plugins/directshow/common/directshowpinenum.cpp
@@ -87,21 +87,20 @@ HRESULT DirectShowPinEnum::QueryInterface(REFIID riid, void **ppv)
 
 HRESULT DirectShowPinEnum::Next(ULONG cPins, IPin **ppPins, ULONG *pcFetched)
 {
-    if (ppPins && (pcFetched || cPins == 1)) {
-        ULONG count = qBound<ULONG>(0, cPins, m_pins.count() - m_index);
-
-        for (ULONG i = 0; i < count; ++i, ++m_index) {
-            ppPins[i] = m_pins.at(m_index);
-            ppPins[i]->AddRef();
-        }
+    if (!ppPins || (!pcFetched && cPins != 1))
+        return E_POINTER;
 
-        if (pcFetched)
-            *pcFetched = count;
+    ULONG count = qBound<ULONG>(0, cPins, m_pins.count() - m_index);
 
-        return count == cPins ? S_OK : S_FALSE;
-    } else {
-        return E_POINTER;
+    for (ULONG i = 0; i < count; ++i, ++m_index) {
+        ppPins[i] = m_pins.at(m_index);
+        ppPins[i]->AddRef();
     }
+
+    if (pcFetched)
+        *pcFetched = count;
+
+    return count == cPins ? S_OK : S_FALSE;
 }
 
 HRESULT DirectShowPinEnum::Skip(ULONG cPins)
@@ -120,16 +119,10 @@ HRESULT DirectShowPinEnum::Reset()
 
 HRESULT DirectShowPinEnum::Clone(IEnumPins **ppEnum)
 {
-    if (ppEnum) {
-        if (m_filter)
-            *ppEnum = new DirectShowPinEnum(m_filter);
-        else
-            *ppEnum = new DirectShowPinEnum(m_pins);
-
-        return S_OK;
-    } else {
+    if (!ppEnum)
         return E_POINTER;
-    }
+    *ppEnum = m_filter ? new DirectShowPinEnum(m_filter) : new DirectShowPinEnum(m_pins);
+    return S_OK;
 }
 
 QT_END_NAMESPACE