From cab88bf23f40ea52e7ebfa09ded3a1081544f238 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 31 Aug 2023 10:02:32 +0200 Subject: [PATCH] Add const, remove unreachable code, and more clang tidy fixes --- src/ArtConfigWindow.h | 3 ++- src/ArtDetailWindow.cpp | 20 +++++++++----------- src/ArtDetailWindow.h | 1 + src/ArtModel.cpp | 3 --- src/ArtModel.h | 9 +++++---- src/MainWindow.h | 1 + src/imagelabel.cpp | 4 ++-- src/imagelabel.h | 8 ++++---- 8 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/ArtConfigWindow.h b/src/ArtConfigWindow.h index ee93710..1a5288e 100644 --- a/src/ArtConfigWindow.h +++ b/src/ArtConfigWindow.h @@ -14,8 +14,9 @@ #include class ArtConfigWindow : public QDialog { + Q_OBJECT public: - ArtConfigWindow(const QString& filename, QWidget* parent = nullptr); + explicit ArtConfigWindow(const QString& filename, QWidget* parent = nullptr); private: void loadData(const QString& filename); diff --git a/src/ArtDetailWindow.cpp b/src/ArtDetailWindow.cpp index 82c4e96..acc5c9c 100644 --- a/src/ArtDetailWindow.cpp +++ b/src/ArtDetailWindow.cpp @@ -52,7 +52,7 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi formLayout->addRow(QStringLiteral("Title"), m_titleEdit); m_knowExactDateBox = new QCheckBox(); - connect(m_knowExactDateBox, &QCheckBox::toggled, this, [=](bool checked) { + connect(m_knowExactDateBox, &QCheckBox::toggled, this, [this](bool checked) { if (checked) { m_dateEdit->setDisplayFormat(QStringLiteral("yyyy-MM-dd")); } else { @@ -100,7 +100,7 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi charactersLayout->addLayout(characterButtonLayout); auto addCharacterButton = new QPushButton(QIcon::fromTheme(QStringLiteral("list-add")), QStringLiteral("Add")); - connect(addCharacterButton, &QPushButton::clicked, this, [=] { + connect(addCharacterButton, &QPushButton::clicked, this, [this] { auto tmp = m_characterListModel->stringList();; tmp.push_back(QStringLiteral("New Character")); m_characterListModel->setStringList(tmp); @@ -109,9 +109,9 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi characterButtonLayout->addStretch(1); auto removeCharacterButton = new QPushButton(QIcon::fromTheme(QStringLiteral("list-remove")), QStringLiteral("Remove")); - connect(removeCharacterButton, &QPushButton::clicked, this, [=] { + connect(removeCharacterButton, &QPushButton::clicked, this, [this, characterList] { if(characterList->selectionModel()->hasSelection()) { - QString toRemove = characterList->selectionModel()->selectedRows()[0].data().toString(); + const QString toRemove = characterList->selectionModel()->selectedRows()[0].data().toString(); auto tmp = m_characterListModel->stringList(); tmp.removeOne(toRemove); @@ -132,7 +132,7 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi tagLayout->addLayout(tagButtonLayout); auto addTagButton = new QPushButton(QIcon::fromTheme(QStringLiteral("list-add")), QStringLiteral("Add")); - connect(addTagButton, &QPushButton::clicked, this, [=] { + connect(addTagButton, &QPushButton::clicked, this, [this] { auto tmp = m_tagsListModel->stringList();; tmp.push_back(QStringLiteral("New Tag")); m_tagsListModel->setStringList(tmp); @@ -141,9 +141,9 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi tagButtonLayout->addStretch(1); auto removeTagButton = new QPushButton(QIcon::fromTheme(QStringLiteral("list-remove")), QStringLiteral("Remove")); - connect(removeTagButton, &QPushButton::clicked, this, [=] { + connect(removeTagButton, &QPushButton::clicked, this, [this, tagsList] { if(tagsList->selectionModel()->hasSelection()) { - QString toRemove = tagsList->selectionModel()->selectedRows()[0].data().toString(); + const QString toRemove = tagsList->selectionModel()->selectedRows()[0].data().toString(); auto tmp = m_tagsListModel->stringList(); tmp.removeOne(toRemove); @@ -156,14 +156,12 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi formLayout->addRow(bottomButtonLayout); auto cancelButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-close")), QStringLiteral("Cancel")); - connect(cancelButton, &QPushButton::clicked, this, [=] { - close(); - }); + connect(cancelButton, &QPushButton::clicked, this, &ArtDetailWindow::close); bottomButtonLayout->addWidget(cancelButton); bottomButtonLayout->addStretch(1); auto saveButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-ok")), QStringLiteral("Save")); - connect(saveButton, &QPushButton::clicked, this, [=] { + connect(saveButton, &QPushButton::clicked, this, [this, filename] { saveData(filename); }); bottomButtonLayout->addWidget(saveButton); diff --git a/src/ArtDetailWindow.h b/src/ArtDetailWindow.h index 6604c1f..c3d34fe 100644 --- a/src/ArtDetailWindow.h +++ b/src/ArtDetailWindow.h @@ -14,6 +14,7 @@ #include class ArtDetailWindow : public QDialog { + Q_OBJECT public: ArtDetailWindow(const QString& filename, const QString& assetDirectory, QWidget* parent = nullptr); diff --git a/src/ArtModel.cpp b/src/ArtModel.cpp index 707ee8e..32c44b4 100644 --- a/src/ArtModel.cpp +++ b/src/ArtModel.cpp @@ -80,10 +80,7 @@ QVariant ArtModel::data(const QModelIndex &index, int role) const { } else if (role == Qt::DecorationRole) { switch(index.column()) { case 1: - { return m_artPieces[index.row()].thumbnail; - } - break; case 3: return m_artPieces[index.row()].hasAltText ? QIcon::fromTheme(QStringLiteral("emblem-checked")) : QIcon::fromTheme(QStringLiteral("emblem-error")); } diff --git a/src/ArtModel.h b/src/ArtModel.h index 3a79521..097157d 100644 --- a/src/ArtModel.h +++ b/src/ArtModel.h @@ -21,14 +21,15 @@ struct ArtPiece { }; class ArtModel : public QAbstractTableModel { + Q_OBJECT public: explicit ArtModel(const QString& definitionDirectory, const QString& assetDirectory); - int rowCount(const QModelIndex &parent) const override; - int columnCount(const QModelIndex &parent) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent) const override; + [[nodiscard]] int columnCount(const QModelIndex &parent) const override; - QVariant data(const QModelIndex &index, int role) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] QVariant headerData(int section, Qt::Orientation orientation, int role) const override; private: void loadData(ArtPiece& piece, const QString& filename, const QString& assetFilename); diff --git a/src/MainWindow.h b/src/MainWindow.h index 6e53ea0..688aa88 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -7,6 +7,7 @@ #include class MainWindow : public QMainWindow { + Q_OBJECT public: explicit MainWindow(const QString& definitionDirectory, const QString& assetDirectory, const QString& dataDirectory); }; diff --git a/src/imagelabel.cpp b/src/imagelabel.cpp index 8dea100..3f41d3c 100644 --- a/src/imagelabel.cpp +++ b/src/imagelabel.cpp @@ -19,8 +19,8 @@ int ImageLabel::heightForWidth(int width) const { } QSize ImageLabel::sizeHint() const { - int w = this->width(); - return QSize(w, heightForWidth(w)); + const int w = this->width(); + return {w, heightForWidth(w)}; } QPixmap ImageLabel::scaledPixmap() const { diff --git a/src/imagelabel.h b/src/imagelabel.h index 0935e51..a0991e8 100644 --- a/src/imagelabel.h +++ b/src/imagelabel.h @@ -11,11 +11,11 @@ class ImageLabel : public QLabel { public: explicit ImageLabel(QWidget *parent = nullptr); - int heightForWidth(int width) const override; - QSize sizeHint() const override; - QPixmap scaledPixmap() const; + [[nodiscard]] int heightForWidth(int width) const override; + [[nodiscard]] QSize sizeHint() const override; + [[nodiscard]] QPixmap scaledPixmap() const; -public slots: +public Q_SLOTS: void setPixmap(const QPixmap &); void resizeEvent(QResizeEvent *) override;