♻️Refactoring: Static analysis - part #5

vookimedlo · Mar 1, 2024 · ad900e9 · ad900e9
1 parent d61015d
commit ad900e9
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/src/processing/transformation/test/ImageTransformationBaseTest.cpp b/src/processing/transformation/test/ImageTransformationBaseTest.cpp
@@ -15,7 +15,7 @@ VookiImageViewer - a tool for showing images.
 #include "../ImageTransformationBase.h"
 
 template<typename T> requires std::is_same_v<QImage, T> || std::is_same_v<QTransform, T>
-class ImageTransformationBaseHelper : public ImageTransformationBase<T>
+class ImageTransformationBaseHelper final : public ImageTransformationBase<T>
 {
 public:
     [[nodiscard]] const T &getOriginalObject() const { return ImageTransformationBase<T>::getOriginalObject(); }

diff --git a/src/processing/transformation/test/ImageZoomTest.cpp b/src/processing/transformation/test/ImageZoomTest.cpp
@@ -16,7 +16,7 @@ VookiImageViewer - a tool for showing images.
 
 void ImageZoomTest::areaSize() const
 {
-    const QSize size{10, 20};
+    constexpr QSize size{10, 20};
     ImageZoom<QTransform> imageZoom;
     QCOMPARE(imageZoom.getAreaSize(), QSize(0, 0));
     QCOMPARE(imageZoom.isCacheDirty(), true);
@@ -46,7 +46,7 @@ void ImageZoomTest::fitToArea() const
 
 void ImageZoomTest::originalImageSize() const
 {
-    const QSize size{10, 20};
+    constexpr QSize size{10, 20};
     ImageZoom<QTransform> imageZoom;
     QCOMPARE(imageZoom.isCacheDirty(), true);
     QCOMPARE(imageZoom.getOriginalImageSize(), QSize());
@@ -58,7 +58,7 @@ void ImageZoomTest::originalImageSize() const
 
 void ImageZoomTest::scaleFactor() const
 {
-    const double scaleFactor = 2;
+    constexpr double scaleFactor = 2;
     ImageZoom<QTransform> imageZoom;
     QCOMPARE(imageZoom.isCacheDirty(), true);
     QCOMPARE(imageZoom.getScaleFactor(), 1);
@@ -70,7 +70,7 @@ void ImageZoomTest::scaleFactor() const
 
 void ImageZoomTest::resetProperties() const
 {
-    const QSize size{10, 20};
+    constexpr QSize size{10, 20};
     ImageZoom<QTransform> imageZoom;
     imageZoom.setIsCacheDirty(false);
     imageZoom.setAreaSize(size);

diff --git a/src/ui/ImageAreaWidget.cpp b/src/ui/ImageAreaWidget.cpp
@@ -273,7 +273,7 @@ void ImageAreaWidget::nativeGestureEvent(QNativeGestureEvent *event)
             }
             break;
         case Qt::SmartZoomNativeGesture: {
-            const double factor = 1000;
+            constexpr double factor = 1000;
             if (event->value() != 0)
                 onZoomImageInTriggered(factor);
             else

diff --git a/src/ui/SettingsDialog.cpp b/src/ui/SettingsDialog.cpp
@@ -90,11 +90,11 @@ void SettingsDialog::initializeUI(const QSettings * const settings)
     m_backgroundColor = settings->value(SETTINGS_IMAGE_BACKGROUND_COLOR).value<QColor>();
     m_languageCode = settings->value(SETTINGS_LANGUAGE_CODE).value<QString>();
 
-    if (std::input_iterator auto findIt = std::ranges::find_if(begin(Languages::m_localizations),
-                                           end(Languages::m_localizations),
-                                           [&languageCode = m_languageCode](const Languages::Record &record){
-                                               return languageCode == record.m_code;
-                                           }); findIt != std::end(Languages::m_localizations))
+    if (const auto findIt = std::ranges::find_if(begin(Languages::m_localizations),
+                                                                               end(Languages::m_localizations),
+                                                                               [&languageCode = m_languageCode](const Languages::Record &record){
+                                                                                   return languageCode == record.m_code;
+                                                                               }); findIt != std::end(Languages::m_localizations))
     {
         const auto position = std::distance(Languages::m_localizations.begin(), findIt);
         m_uiSettingsDialog.comboBoxLanguage->setCurrentIndex(position);

diff --git a/src/ui/forms/AboutSupportedFormatsDialog.ui b/src/ui/forms/AboutSupportedFormatsDialog.ui
@@ -607,7 +607,7 @@
      </item>
      <item row="33" column="0">
       <property name="text">
-       <string>[MacOS/Win only] HEIC</string>
+       <string>[macOS/win only] HEIC</string>
       </property>
      </item>
      <item row="33" column="1">

diff --git a/src/ui/support/SettingsShortcutsTableWidgetItem.cpp b/src/ui/support/SettingsShortcutsTableWidgetItem.cpp
@@ -11,8 +11,7 @@ VookiImageViewer - a tool for showing images.
 #include "SettingsShortcutsTableWidgetItem.h"
 
 SettingsShortcutsTableWidgetItem::SettingsShortcutsTableWidgetItem(QAction &action)
-                                        : QObject()
-                                        , QTableWidgetItem(SettingsShortcutsTableWidgetItem::type)
+                                        : QTableWidgetItem(SettingsShortcutsTableWidgetItem::type)
                                         , m_action(action)
                                         , m_keySequence(action.shortcut())
 {

diff --git a/src/ui/test/SettingsDialogTest.cpp b/src/ui/test/SettingsDialogTest.cpp
@@ -68,7 +68,7 @@ void SettingsDialogTest::shortcuts() const
     QCOMPARE(userSettingsOnAccepted, userSettingsInitializedFromMenu);
 
     // Test the SettingsShortcutsTableWidgetItem::onKeySequenceChanged()
-    const auto standardKey = QKeySequence::StandardKey::MoveToNextPage;
+    constexpr auto standardKey = QKeySequence::StandardKey::MoveToNextPage;
     for (int i = 0; i < tableWidget->rowCount(); ++i)
         dynamic_cast<QKeySequenceEdit *>(tableWidget->cellWidget(i, 0))->setKeySequence(standardKey);