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>

1 files changed, 10 insertions, 8 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) {