Multiple Clang-tidy fixes.

przemek83 · Jan 23, 2025 · 50fb1f5 · 50fb1f5
1 parent fba03e2
commit 50fb1f5
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 26 deletions.
diff --git a/Tests/DatasetVisualizationTest.cpp b/Tests/DatasetVisualizationTest.cpp
@@ -26,7 +26,7 @@ std::unique_ptr<Dataset> DatasetVisualizationTest::getDataset()
 }
 
 std::unique_ptr<Dataset> getDataset();
-void DatasetVisualizationTest::testGetDataset() const
+void DatasetVisualizationTest::testGetDataset()
 {
     std::unique_ptr<Dataset> expectedDataset{getDataset()};
 
@@ -53,7 +53,7 @@ void DatasetVisualizationTest::testGetDatasetWithoutSettingIt()
     QCOMPARE(dataset, nullptr);
 }
 
-void DatasetVisualizationTest::testClearDataset() const
+void DatasetVisualizationTest::testClearDataset()
 {
     std::unique_ptr<Dataset> expectedDataset{getDataset()};
     DatasetVisualization visualization(nullptr);
@@ -65,7 +65,7 @@ void DatasetVisualizationTest::testClearDataset() const
     QCOMPARE(dataset, nullptr);
 }
 
-void DatasetVisualizationTest::testSelectCurrentColumn() const
+void DatasetVisualizationTest::testSelectCurrentColumn()
 {
     std::unique_ptr<Dataset> dataset{getDataset()};
     DatasetVisualization visualization(nullptr);

diff --git a/Tests/DatasetVisualizationTest.h b/Tests/DatasetVisualizationTest.h
@@ -13,11 +13,11 @@ class DatasetVisualizationTest : public QObject
     static std::unique_ptr<Dataset> getDataset();
 
 private slots:
-    void testGetDataset() const;
+    static void testGetDataset();
 
     static void testGetDatasetWithoutSettingIt();
 
-    void testClearDataset() const;
+    static void testClearDataset();
 
-    void testSelectCurrentColumn() const;
+    static void testSelectCurrentColumn();
 };
diff --git a/src/Common/Configuration.cpp b/src/Common/Configuration.cpp
@@ -154,7 +154,13 @@ bool Configuration::saveConfigXml(const QString& configXml)
 {
     const QString filename{QApplication::applicationDirPath() + "/" +
                            constants::getConfigurationFileName()};
-    QFile::remove(filename);
+
+    if (bool success{QFile::remove(filename)}; !success)
+    {
+        LOG(LogTypes::CONFIG, "Cannot remove config file " + filename);
+        return false;
+    }
+
     QFile file(filename);
 
     if (!file.open(QIODevice::WriteOnly))

diff --git a/src/Import/ImportData.cpp b/src/Import/ImportData.cpp
@@ -7,8 +7,8 @@
 
 #include <Datasets/Dataset.h>
 
-ImportData::ImportData(const QString& importFilePath)
-    : spreadsheetsTab_{importFilePath}
+ImportData::ImportData(QString importFilePath)
+    : spreadsheetsTab_{std::move(importFilePath)}
 {
     setupLayout();
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

diff --git a/src/Import/ImportData.h b/src/Import/ImportData.h
@@ -17,7 +17,7 @@ class ImportData : public QDialog
 {
     Q_OBJECT
 public:
-    explicit ImportData(const QString& importFilePath);
+    explicit ImportData(QString importFilePath);
 
     std::unique_ptr<Dataset> getSelectedDataset();
 

diff --git a/src/Import/SpreadsheetsImportTab.cpp b/src/Import/SpreadsheetsImportTab.cpp
@@ -22,10 +22,10 @@
 #include "DatasetVisualization.h"
 #include "ui_SpreadsheetsImportTab.h"
 
-SpreadsheetsImportTab::SpreadsheetsImportTab(const QString& importFilePath)
+SpreadsheetsImportTab::SpreadsheetsImportTab(QString importFilePath)
     : ImportTab(),
       ui_{std::make_unique<Ui::SpreadsheetsImportTab>()},
-      importFilePath_{importFilePath}
+      importFilePath_{std::move(importFilePath)}
 {
     ui_->setupUi(this);
 

diff --git a/src/Import/SpreadsheetsImportTab.h b/src/Import/SpreadsheetsImportTab.h
@@ -18,7 +18,7 @@ class SpreadsheetsImportTab : public ImportTab
 {
     Q_OBJECT
 public:
-    explicit SpreadsheetsImportTab(const QString& importFilePath);
+    explicit SpreadsheetsImportTab(QString importFilePath);
 
     ~SpreadsheetsImportTab() override;
 

diff --git a/src/ModelsAndViews/PlotDataProvider.cpp b/src/ModelsAndViews/PlotDataProvider.cpp
@@ -118,9 +118,10 @@ PlotDataProvider::computePointsAndRegression()
     quantiles_.maxX_ = maxX;
 
     // Calc linear regression and create points.
-    const double a{((dataSize * sumXY) - (sumX * sumY)) /
-                   ((dataSize * sumXX) - (sumX * sumX))};
-    const double b{(sumY / dataSize) - ((a * sumX) / dataSize)};
+    double sizeAsDouble{static_cast<double>(dataSize)};
+    const double a{((sizeAsDouble * sumXY) - (sumX * sumY)) /
+                   ((sizeAsDouble * sumXX) - (sumX * sumX))};
+    const double b{(sumY / sizeAsDouble) - ((a * sumX) / sizeAsDouble)};
 
     const QPointF linearRegressionFrom(minX, (a * minX) + b);
     const QPointF linearRegressionTo(maxX, (a * maxX) + b);

diff --git a/src/Update/Update.cpp b/src/Update/Update.cpp
@@ -204,10 +204,15 @@ void Update::saveVerfiedFile(const QByteArray& fileData,
     insertSuccessInfoIntoDetails(tr("Verified"));
     insertNewLineIntoDetails();
 
-    QFile file(QApplication::applicationDirPath() + QLatin1Char('/') +
-               fileName + tmpPrefix_);
-    file.remove();
-    file.open(QIODevice::WriteOnly);
+    QString filePath{QApplication::applicationDirPath() + QLatin1Char('/') +
+                     fileName + tmpPrefix_};
+    QFile file(filePath);
+
+    if (bool success{file.remove()}; !success)
+        LOG(LogTypes::NETWORK,
+            QStringLiteral("Cannot remove file ") + filePath);
+
+    file.open(QIODevice::WriteOnly | QIODevice::Truncate);
     file.write(fileData);
 
     LOG(LogTypes::NETWORK,
@@ -249,8 +254,16 @@ void Update::renameTempFile(const QString& file)
                           targetFileName.section(QLatin1Char('/'), -1));
     insertNewLineIntoDetails();
 
-    QFile::remove(targetFileName);
-    QFile::rename(file, targetFileName);
+    bool success{QFile::remove(targetFileName)};
+    if (!success)
+        LOG(LogTypes::NETWORK,
+            QString::fromLatin1("Cannot remove file: ") + targetFileName);
+
+    success = QFile::rename(file, targetFileName);
+    if (!success)
+        LOG(LogTypes::NETWORK, QString::fromLatin1("Cannot rename file ") +
+                                   file + QString::fromLatin1(" to ") +
+                                   targetFileName);
 }
 
 void Update::finalizeUpdate()

diff --git a/src/Update/Update.h b/src/Update/Update.h
@@ -55,7 +55,7 @@ class Update : public QWidget
 
     void renameTempFile(const QString& file);
 
-    Ui::Update ui_;
+    Ui::Update ui_{};
 
     QNetworkAccessManager initialInfoNetworkManager_;
 

diff --git a/src/Volbx/main.cpp b/src/Volbx/main.cpp
@@ -21,9 +21,14 @@ void overwriteUpdaterfIfNeeded()
                                updaterFile +
                                constants::getTemporaryFileSuffix());
 
-        QFile::remove(updaterFile);
-        QFile::rename(updaterFile + constants::getTemporaryFileSuffix(),
-                      updaterFile);
+        bool success{QFile::remove(updaterFile)};
+        if (!success)
+            LOG(LogTypes::APP, "Cannot remove " + updaterFile);
+
+        success = QFile::rename(
+            updaterFile + constants::getTemporaryFileSuffix(), updaterFile);
+        if (!success)
+            LOG(LogTypes::APP, "Cannot rename file to " + updaterFile);
     }
 }
 }  // namespace