From 40f522f2eda5fe7a67c5b2578c441caeaccf0a99 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 8 Sep 2024 11:11:14 -0400 Subject: [PATCH] refactor: better logical grouping, several range detachment warnings and other small warning cleanups --- src/data/FF7Char.cpp | 2 +- src/data/FF7Item.cpp | 4 ++-- src/data/FF7Location.cpp | 3 +++ src/formats/IsoArchive.cpp | 6 ++++-- src/formats/IsoArchiveFF7.cpp | 8 ++++---- src/formats/Lgp_p.cpp | 3 ++- src/formats/TexFile.cpp | 2 +- src/widgets/common/DialogPreview.h | 2 +- src/widgets/common/ImageGridWidget.cpp | 2 +- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/data/FF7Char.cpp b/src/data/FF7Char.cpp index 1f6cac945..25962edea 100644 --- a/src/data/FF7Char.cpp +++ b/src/data/FF7Char.cpp @@ -56,7 +56,7 @@ quint8 FF7Char::id(int who) bool FF7Char::validID(int id) { - return !(id < 0 || id > 11); + return !((id < 0) || (id > 11)); } int FF7Char::numberOfWeapons(int who) diff --git a/src/data/FF7Item.cpp b/src/data/FF7Item.cpp index 33e0952e4..eb119f0ff 100644 --- a/src/data/FF7Item.cpp +++ b/src/data/FF7Item.cpp @@ -163,7 +163,7 @@ QStringList FF7Item::elementalEffects(int id) { QStringList elementList; - if (id < 0 || id > 319) { + if ((id < 0) || (id > 319)) { return elementList; } for (int i = 0; i < 14; i++) { @@ -273,7 +273,7 @@ QStringList FF7Item::statusEffects(int id) { QStringList statusList; - if (id < 0 || id > 319) { + if ((id < 0) || (id > 319)) { return statusList; } for (int i = 0; i < 24; i++) { diff --git a/src/data/FF7Location.cpp b/src/data/FF7Location.cpp index d529cc097..d7bcb7189 100644 --- a/src/data/FF7Location.cpp +++ b/src/data/FF7Location.cpp @@ -53,14 +53,17 @@ const QString &FF7Location::fileName(int MapID, int LocID) return it->filename; return get()->dPtr->_emptyLocation.filename; } + QString FF7Location::rawLocationString(int index) { return get()->dPtr->_locations.at(index).location; } + QString FF7Location::rawLocationString(const QString &fileName) { return location(fileName).location; } + QString FF7Location::locationString(int index) { return tr(get()->dPtr->_locations.at(index).location.toUtf8()); diff --git a/src/formats/IsoArchive.cpp b/src/formats/IsoArchive.cpp index 89f9820a2..9d49788f8 100644 --- a/src/formats/IsoArchive.cpp +++ b/src/formats/IsoArchive.cpp @@ -1143,7 +1143,8 @@ IsoDirectory *IsoArchive::_openDirectoryRecord(IsoDirectory *directories, QList< } } - for (IsoDirectory *dir : directories->directories()) { + const auto dirs = directories->directories(); + for (IsoDirectory *dir : dirs) { if (!dir->isSpecial()) { if (!_openDirectoryRecord(dir, dirVisisted)) { qWarning() << "IsoArchive::_openDirectoryRecord cannot open directory" << dir->name() << dir->location(); @@ -1263,7 +1264,8 @@ bool IsoArchive::extractDir(const QString &path, const QString &destination) con QDir destDir(destination); bool error = false; - for (IsoFile *file : dir->files()) { + const auto files = dir->files(); + for (IsoFile *file : files) { if (!file->extract(destDir.filePath(file->name()))) { error = true; } diff --git a/src/formats/IsoArchiveFF7.cpp b/src/formats/IsoArchiveFF7.cpp index 6c6f102ab..8db01a70b 100644 --- a/src/formats/IsoArchiveFF7.cpp +++ b/src/formats/IsoArchiveFF7.cpp @@ -48,7 +48,7 @@ IsoFile *IsoArchiveFF7::searchExe() const } static const QRegularExpression exeName(QRegularExpression::anchoredPattern("[A-Z]{4}_\\d{3}\\.\\d{2}")); - QList files = rootDirectory()->files(); + const QList files = rootDirectory()->files(); for (IsoFile *isoFile : files) { QRegularExpressionMatch match = exeName.match(isoFile->name()); if (match.hasMatch()) { @@ -231,7 +231,7 @@ QMap IsoArchiveFF7::maplist() QMap orderedFields, ret; int min = -1; - QList files = fieldDirectory->files(); + const QList files = fieldDirectory->files(); for (const IsoFile *field : files) { if (!field->name().endsWith(".DAT")) { @@ -381,7 +381,7 @@ IsoFile *IsoArchiveFF7::updateFieldBin() } QList files; - QList f = fieldDirectory->files(); + const QList f = fieldDirectory->files(); for (IsoFile *file : f) { if (!file->name().endsWith(".X") && file->name() != "FIELD.BIN") { @@ -412,7 +412,7 @@ IsoFile *IsoArchiveFF7::updateWorldBin() } QList files; - QList f = worldDirectory->files(); + const QList f = worldDirectory->files(); for (IsoFile *file : f) { if (file->name() != "WORLD.BIN") { files.append(file); diff --git a/src/formats/Lgp_p.cpp b/src/formats/Lgp_p.cpp index aca7d4cad..6b073105e 100644 --- a/src/formats/Lgp_p.cpp +++ b/src/formats/Lgp_p.cpp @@ -264,7 +264,8 @@ bool LgpToc::hasEntries(quint16 id) const LgpHeaderEntry *LgpToc::entry(const QString &filePath, quint16 id) const { - for (LgpHeaderEntry *entry : entries(id)) { + const auto _entries = entries(id); + for (LgpHeaderEntry *entry : _entries) { if (filePath.compare(entry->filePath(), Qt::CaseInsensitive) == 0) { return entry; } diff --git a/src/formats/TexFile.cpp b/src/formats/TexFile.cpp index ec38cfb5d..480ac1a24 100644 --- a/src/formats/TexFile.cpp +++ b/src/formats/TexFile.cpp @@ -77,7 +77,7 @@ bool TexFile::open(const QByteArray &data) quint16 color; _image = QImage(w, h, QImage::Format_ARGB32); QRgb *pixels = reinterpret_cast(_image.bits()); - if (header.bytesPerPixel < 2 || header.bytesPerPixel > 4) { + if ((header.bytesPerPixel < 2) || (header.bytesPerPixel > 4)) { qWarning() << "tex invalid bytesPerPixel!" << header.bytesPerPixel; return false; } diff --git a/src/widgets/common/DialogPreview.h b/src/widgets/common/DialogPreview.h index 56fca967f..d58d2a380 100644 --- a/src/widgets/common/DialogPreview.h +++ b/src/widgets/common/DialogPreview.h @@ -20,7 +20,7 @@ class FF7TKQTWIDGETS_EXPORT DialogPreview : public QLabel BOTTOMRIGHT=2, BOTTOMLEFT=3, }; - Q_ENUM(CORNER); + Q_ENUM(CORNER) DialogPreview(QWidget *parent = nullptr); ~DialogPreview() = default; diff --git a/src/widgets/common/ImageGridWidget.cpp b/src/widgets/common/ImageGridWidget.cpp index 05a677177..857c9d75a 100644 --- a/src/widgets/common/ImageGridWidget.cpp +++ b/src/widgets/common/ImageGridWidget.cpp @@ -182,7 +182,7 @@ void ImageGridWidget::paintEvent(QPaintEvent *event) QColor lightRed(0xff, 0x7f, 0x7f); p.setPen(hasFocus() ? Qt::red : lightRed); - for (const Cell &cell: _selectedCells) { + for (const Cell &cell: std::as_const(_selectedCells)) { drawSelection(p, cell); }