redstrate/redai
1
Fork 0
Code Activity Actions

Add const, remove unreachable code, and more clang tidy fixes

Browse source
This commit is contained in:
Joshua Goins 2023-08-31 10:02:32 +02:00
parent 6d92853f05
commit cab88bf23f
8 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ArtConfigWindow.h
View file

@ -14,8 +14,9 @@
#include <QDialog> #include <QDialog>
class ArtConfigWindow : public QDialog { class ArtConfigWindow : public QDialog {
Q_OBJECT
public: public:
ArtConfigWindow(const QString& filename, QWidget* parent = nullptr); explicit ArtConfigWindow(const QString& filename, QWidget* parent = nullptr);
private: private:
void loadData(const QString& filename); void loadData(const QString& filename);

20
src/ArtDetailWindow.cpp
View file

@ -52,7 +52,7 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi
formLayout->addRow(QStringLiteral("Title"), m_titleEdit); formLayout->addRow(QStringLiteral("Title"), m_titleEdit);
m_knowExactDateBox = new QCheckBox(); m_knowExactDateBox = new QCheckBox();
connect(m_knowExactDateBox, &QCheckBox::toggled, this, [=](bool checked) { connect(m_knowExactDateBox, &QCheckBox::toggled, this, [this](bool checked) {
if (checked) { if (checked) {
m_dateEdit->setDisplayFormat(QStringLiteral("yyyy-MM-dd")); m_dateEdit->setDisplayFormat(QStringLiteral("yyyy-MM-dd"));
} else { } else {
@ -100,7 +100,7 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi
charactersLayout->addLayout(characterButtonLayout); charactersLayout->addLayout(characterButtonLayout);
auto addCharacterButton = new QPushButton(QIcon::fromTheme(QStringLiteral("list-add")), QStringLiteral("Add")); 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();; auto tmp = m_characterListModel->stringList();;
tmp.push_back(QStringLiteral("New Character")); tmp.push_back(QStringLiteral("New Character"));
m_characterListModel->setStringList(tmp); m_characterListModel->setStringList(tmp);
@ -109,9 +109,9 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi
characterButtonLayout->addStretch(1); characterButtonLayout->addStretch(1);
auto removeCharacterButton = new QPushButton(QIcon::fromTheme(QStringLiteral("list-remove")), QStringLiteral("Remove")); 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()) { 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(); auto tmp = m_characterListModel->stringList();
tmp.removeOne(toRemove); tmp.removeOne(toRemove);
@ -132,7 +132,7 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi
tagLayout->addLayout(tagButtonLayout); tagLayout->addLayout(tagButtonLayout);
auto addTagButton = new QPushButton(QIcon::fromTheme(QStringLiteral("list-add")), QStringLiteral("Add")); 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();; auto tmp = m_tagsListModel->stringList();;
tmp.push_back(QStringLiteral("New Tag")); tmp.push_back(QStringLiteral("New Tag"));
m_tagsListModel->setStringList(tmp); m_tagsListModel->setStringList(tmp);
@ -141,9 +141,9 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi
tagButtonLayout->addStretch(1); tagButtonLayout->addStretch(1);
auto removeTagButton = new QPushButton(QIcon::fromTheme(QStringLiteral("list-remove")), QStringLiteral("Remove")); 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()) { 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(); auto tmp = m_tagsListModel->stringList();
tmp.removeOne(toRemove); tmp.removeOne(toRemove);
@ -156,14 +156,12 @@ ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDi
formLayout->addRow(bottomButtonLayout); formLayout->addRow(bottomButtonLayout);
auto cancelButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-close")), QStringLiteral("Cancel")); auto cancelButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-close")), QStringLiteral("Cancel"));
connect(cancelButton, &QPushButton::clicked, this, [=] { connect(cancelButton, &QPushButton::clicked, this, &ArtDetailWindow::close);
close();
});
bottomButtonLayout->addWidget(cancelButton); bottomButtonLayout->addWidget(cancelButton);
bottomButtonLayout->addStretch(1); bottomButtonLayout->addStretch(1);
auto saveButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-ok")), QStringLiteral("Save")); 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); saveData(filename);
}); });
bottomButtonLayout->addWidget(saveButton); bottomButtonLayout->addWidget(saveButton);

1
src/ArtDetailWindow.h
View file

@ -14,6 +14,7 @@
#include <QDialog> #include <QDialog>
class ArtDetailWindow : public QDialog { class ArtDetailWindow : public QDialog {
Q_OBJECT
public: public:
ArtDetailWindow(const QString& filename, const QString& assetDirectory, QWidget* parent = nullptr); ArtDetailWindow(const QString& filename, const QString& assetDirectory, QWidget* parent = nullptr);

3
src/ArtModel.cpp
View file

@ -80,10 +80,7 @@ QVariant ArtModel::data(const QModelIndex &index, int role) const {
} else if (role == Qt::DecorationRole) { } else if (role == Qt::DecorationRole) {
switch(index.column()) { switch(index.column()) {
case 1: case 1:
{
return m_artPieces[index.row()].thumbnail; return m_artPieces[index.row()].thumbnail;
}
break;
case 3: case 3:
return m_artPieces[index.row()].hasAltText ? QIcon::fromTheme(QStringLiteral("emblem-checked")) : QIcon::fromTheme(QStringLiteral("emblem-error")); return m_artPieces[index.row()].hasAltText ? QIcon::fromTheme(QStringLiteral("emblem-checked")) : QIcon::fromTheme(QStringLiteral("emblem-error"));
} }

9
src/ArtModel.h
View file

@ -21,14 +21,15 @@ struct ArtPiece {
}; };
class ArtModel : public QAbstractTableModel { class ArtModel : public QAbstractTableModel {
Q_OBJECT
public: public:
explicit ArtModel(const QString& definitionDirectory, const QString& assetDirectory); explicit ArtModel(const QString& definitionDirectory, const QString& assetDirectory);
int rowCount(const QModelIndex &parent) const override; [[nodiscard]] int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const override; [[nodiscard]] int columnCount(const QModelIndex &parent) const override;
QVariant data(const QModelIndex &index, int role) const override; [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const override; [[nodiscard]] QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
private: private:
void loadData(ArtPiece& piece, const QString& filename, const QString& assetFilename); void loadData(ArtPiece& piece, const QString& filename, const QString& assetFilename);

1
src/MainWindow.h
View file

@ -7,6 +7,7 @@
#include <QMainWindow> #include <QMainWindow>
class MainWindow : public QMainWindow { class MainWindow : public QMainWindow {
Q_OBJECT
public: public:
explicit MainWindow(const QString& definitionDirectory, const QString& assetDirectory, const QString& dataDirectory); explicit MainWindow(const QString& definitionDirectory, const QString& assetDirectory, const QString& dataDirectory);
}; };

4
src/imagelabel.cpp
View file

@ -19,8 +19,8 @@ int ImageLabel::heightForWidth(int width) const {
} }
QSize ImageLabel::sizeHint() const { QSize ImageLabel::sizeHint() const {
int w = this->width(); const int w = this->width();
return QSize(w, heightForWidth(w)); return {w, heightForWidth(w)};
} }
QPixmap ImageLabel::scaledPixmap() const { QPixmap ImageLabel::scaledPixmap() const {

8
src/imagelabel.h
View file

@ -11,11 +11,11 @@ class ImageLabel : public QLabel {
public: public:
explicit ImageLabel(QWidget *parent = nullptr); explicit ImageLabel(QWidget *parent = nullptr);
int heightForWidth(int width) const override; [[nodiscard]] int heightForWidth(int width) const override;
QSize sizeHint() const override; [[nodiscard]] QSize sizeHint() const override;
QPixmap scaledPixmap() const; [[nodiscard]] QPixmap scaledPixmap() const;
public slots: public Q_SLOTS:
void setPixmap(const QPixmap &); void setPixmap(const QPixmap &);
void resizeEvent(QResizeEvent *) override; void resizeEvent(QResizeEvent *) override;