Skip to content

Commit

Permalink
Multiple Clang-tidy fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
przemek83 committed Jan 23, 2025
1 parent 7a873c0 commit fba03e2
Show file tree
Hide file tree
Showing 18 changed files with 25 additions and 28 deletions.
3 changes: 1 addition & 2 deletions Tests/ConfigurationTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ void ConfigurationTest::testReadingEmptyConfigurationFile() const

void ConfigurationTest::cleanupTestCase() const
{
QFile::remove(configurationFileName_);
QFile file(configurationFileName_);
QVERIFY(file.open(QIODevice::WriteOnly));
QVERIFY(file.open(QIODeviceBase::Truncate | QIODevice::WriteOnly));
QVERIFY(-1 != file.write(configurationFileContent_.toStdString().c_str()));
}
6 changes: 3 additions & 3 deletions Tests/DatasetVisualizationTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#include "Common.h"
#include "DatasetCommon.h"

std::unique_ptr<Dataset> DatasetVisualizationTest::getDataset() const
std::unique_ptr<Dataset> DatasetVisualizationTest::getDataset()
{
const QString fileName{"smallDataSet.ods"};
const QString fileName{QStringLiteral("smallDataSet.ods")};
const QString filePath(Common::getSpreadsheetsDir() + fileName);
std::unique_ptr<Dataset> dataset{
DatasetCommon::createDataset(fileName, filePath)};
Expand Down Expand Up @@ -44,7 +44,7 @@ void DatasetVisualizationTest::testGetDataset() const
true);
}

void DatasetVisualizationTest::testGetDatasetWithoutSettingIt() const
void DatasetVisualizationTest::testGetDatasetWithoutSettingIt()
{
DatasetVisualization visualization(nullptr);

Expand Down
4 changes: 2 additions & 2 deletions Tests/DatasetVisualizationTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ class DatasetVisualizationTest : public QObject
Q_OBJECT

private:
std::unique_ptr<Dataset> getDataset() const;
static std::unique_ptr<Dataset> getDataset();

private slots:
void testGetDataset() const;

void testGetDatasetWithoutSettingIt() const;
static void testGetDatasetWithoutSettingIt();

void testClearDataset() const;

Expand Down
4 changes: 2 additions & 2 deletions Tests/DetailedSpreadsheetsTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ void DetailedSpreadsheetsTest::testNumericColumnRanges()
struct DateCheckData
{
int columnIndex{constants::NOT_SET_COLUMN};
QDate min{};
QDate max{};
QDate min;
QDate max;
bool emptyDates{false};
};

Expand Down
2 changes: 1 addition & 1 deletion Tests/DetailedSpreadsheetsTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class DetailedSpreadsheetsTest : public QObject
public:
struct Field
{
QVariant data{};
QVariant data;
int row{0};
int column{0};
};
Expand Down
2 changes: 1 addition & 1 deletion src/Datasets/Dataset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <Constants.h>

Dataset::Dataset(QString name) : QObject(), name_{std::move(name)} {}
Dataset::Dataset(QString name) : name_{std::move(name)} {}

int Dataset::rowCount() const { return rowsCount_; }

Expand Down
2 changes: 1 addition & 1 deletion src/GUI/DockTitleBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <QPainter>
#include <QStyle>

DockTitleBar::DockTitleBar() : QWidget()
DockTitleBar::DockTitleBar()
{
ui_->setupUi(this);
ui_->reset->setVisible(false);
Expand Down
2 changes: 1 addition & 1 deletion src/GUI/SaveDatasetAs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <QRegularExpressionValidator>

SaveDatasetAs::SaveDatasetAs(QStringList usedNames)
: QDialog(), usedNames_{std::move(usedNames)}
: usedNames_{std::move(usedNames)}
{
ui_->setupUi(this);

Expand Down
2 changes: 1 addition & 1 deletion src/GUI/Tab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <Datasets/Dataset.h>

Tab::Tab(std::unique_ptr<Dataset> dataset, QString name, QWidget* parent)
Tab::Tab(std::unique_ptr<Dataset> dataset, const QString& name, QWidget* parent)
: QMainWindow(parent),
proxyModel_{this},
model_{std::move(dataset)},
Expand Down
2 changes: 1 addition & 1 deletion src/GUI/Tab.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Tab : public QMainWindow
{
Q_OBJECT
public:
Tab(std::unique_ptr<Dataset> dataset, QString name, QWidget* parent);
Tab(std::unique_ptr<Dataset> dataset, const QString &name, QWidget* parent);

FilteringProxyModel* getCurrentProxyModel() const;

Expand Down
2 changes: 1 addition & 1 deletion src/GUI/TabBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <qvalidator.h>

TabBar::TabBar() : QTabBar(), nameEdit_(this) { setupLineEdit(); }
TabBar::TabBar() : nameEdit_(this) { setupLineEdit(); }

void TabBar::mouseDoubleClickEvent(QMouseEvent* event)
{
Expand Down
5 changes: 1 addition & 4 deletions src/GUI/VolbxMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@
#include "TabWidget.h"

VolbxMain::VolbxMain(Configuration config)
: QMainWindow(),
filters_(this),
tabWidget_(this),
config_{std::move(config)}
: filters_(this), tabWidget_(this), config_{std::move(config)}
{
ui_->setupUi(this);

Expand Down
2 changes: 1 addition & 1 deletion src/Import/ImportData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <Datasets/Dataset.h>

ImportData::ImportData(const QString& importFilePath)
: QDialog(), spreadsheetsTab_{importFilePath}
: spreadsheetsTab_{importFilePath}
{
setupLayout();
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
Expand Down
2 changes: 1 addition & 1 deletion src/Import/SpreadsheetsImportTab.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class QFileInfo;
namespace Ui
{
class SpreadsheetsImportTab;
}
} // namespace Ui

class SpreadsheetsImportTab : public ImportTab
{
Expand Down
2 changes: 1 addition & 1 deletion src/ModelsAndViews/TableModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "Constants.h"

TableModel::TableModel(std::unique_ptr<Dataset> dataset)
: QAbstractTableModel(), dataset_(std::move(dataset))
: dataset_(std::move(dataset))
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "LoggerCheckBox.h"

Logger::Logger() : QObject()
Logger::Logger()
{
display_.setWindowTitle(QStringLiteral("Logs"));

Expand Down
7 changes: 4 additions & 3 deletions src/Shared/Logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@

#include "LogType.h"

#define LOG(type, msg) \
Logger::getInstance().info((type), QString::fromLatin1(__FILE__), \
QString::fromLatin1(__FUNCTION__), __LINE__, (msg))
#define LOG(type, msg) \
Logger::getInstance().info((type), QString::fromLatin1(__FILE__), \
QString::fromLatin1(__FUNCTION__), __LINE__, \
(msg))

class QTextEdit;
class QWidget;
Expand Down
2 changes: 1 addition & 1 deletion src/Update/Update.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <Shared/Logger.h>
#include <Shared/Networking.h>

Update::Update() : QWidget()
Update::Update()
{
ui_.setupUi(this);

Expand Down

0 comments on commit fba03e2

Please sign in to comment.