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>

2 files changed, 18 insertions, 18 deletions

diff --git a/src/plugins/directshow/camera/directshowcameraexposurecontrol.cpp b/src/plugins/directshow/camera/directshowcameraexposurecontrol.cpp
index 7ece366ea..6f138450c 100644
--- a/src/plugins/directshow/camera/directshowcameraexposurecontrol.cpp
+++ b/src/plugins/directshow/camera/directshowcameraexposurecontrol.cpp
@@ -68,13 +68,16 @@ DirectShowCameraExposureControl::DirectShowCameraExposureControl(DSCameraSession
 
 bool DirectShowCameraExposureControl::isParameterSupported(QCameraExposureControl::ExposureParameter parameter) const
 {
-    if (parameter == ShutterSpeed)
-        return (m_shutterSpeedValues.caps & CameraControl_Flags_Manual);
-    if (parameter == Aperture)
+    switch (parameter) {
+    case QCameraExposureControl::Aperture:
         return (m_apertureValues.caps & CameraControl_Flags_Manual);
-    if (parameter == ExposureMode)
+    case QCameraExposureControl::ShutterSpeed:
+        return (m_shutterSpeedValues.caps & CameraControl_Flags_Manual);
+    case QCameraExposureControl::ExposureMode:
         return true;
-
+    default:
+        break;
+    }
     return false;
 }
 
@@ -156,10 +159,9 @@ bool DirectShowCameraExposureControl::setValue(QCameraExposureControl::ExposureP
         if (parameter == ShutterSpeed) {
             m_requestedShutterSpeed = newValue;
             return setShutterSpeed(cameraControl, m_requestedShutterSpeed);
-        } else {
-            m_requestedAperture = newValue;
-            return setAperture(cameraControl, m_requestedAperture);
         }
+        m_requestedAperture = newValue;
+        return setAperture(cameraControl, m_requestedAperture);
     }
 
     if (parameter == ExposureMode) {
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index 6b3662290..bf81262d6 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -130,30 +130,28 @@ void DSCameraSession::setViewfinderSettings(const QCameraViewfinderSettings &set
 qreal DSCameraSession::scaledImageProcessingParameterValue(
         const ImageProcessingParameterInfo &sourceValueInfo)
 {
-    if (sourceValueInfo.currentValue == sourceValueInfo.defaultValue) {
+    if (sourceValueInfo.currentValue == sourceValueInfo.defaultValue)
         return 0.0f;
-    } else if (sourceValueInfo.currentValue < sourceValueInfo.defaultValue) {
+    if (sourceValueInfo.currentValue < sourceValueInfo.defaultValue) {
         return ((sourceValueInfo.currentValue - sourceValueInfo.minimumValue)
                 / qreal(sourceValueInfo.defaultValue - sourceValueInfo.minimumValue))
                 + (-1.0f);
-    } else {
-        return ((sourceValueInfo.currentValue - sourceValueInfo.defaultValue)
-                / qreal(sourceValueInfo.maximumValue - sourceValueInfo.defaultValue));
     }
+    return ((sourceValueInfo.currentValue - sourceValueInfo.defaultValue)
+            / qreal(sourceValueInfo.maximumValue - sourceValueInfo.defaultValue));
 }
 
 qint32 DSCameraSession::sourceImageProcessingParameterValue(
         qreal scaledValue, const ImageProcessingParameterInfo &valueRange)
 {
-    if (qFuzzyIsNull(scaledValue)) {
+    if (qFuzzyIsNull(scaledValue))
         return valueRange.defaultValue;
-    } else if (scaledValue < 0.0f) {
+    if (scaledValue < 0.0f) {
         return ((scaledValue - (-1.0f)) * (valueRange.defaultValue - valueRange.minimumValue))
                 + valueRange.minimumValue;
-    } else {
-        return (scaledValue * (valueRange.maximumValue - valueRange.defaultValue))
-                + valueRange.defaultValue;
     }
+    return (scaledValue * (valueRange.maximumValue - valueRange.defaultValue))
+            + valueRange.defaultValue;
 }
 
 static QCameraImageProcessingControl::ProcessingParameter searchRelatedResultingParameter(