From 81e9c09be8f86ff95301e1cd59e4c0776575267a Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 9 Dec 2023 22:35:59 -0500 Subject: [PATCH] Fix most warnings --- argcracker/CMakeLists.txt | 1 - armoury/src/fullmodelviewer.cpp | 30 +++++++++---------- armoury/src/gearlistmodel.cpp | 7 +++-- armoury/src/gearview.cpp | 14 ++++----- armoury/src/mainwindow.cpp | 6 ++-- armoury/src/settingswindow.cpp | 4 +-- armoury/src/singlegearview.cpp | 12 ++++---- common/include/novusmainwindow.h | 3 ++ extern/CMakeLists.txt | 1 + extern/dxbc | 2 +- karuku/src/mainwindow.cpp | 2 +- launcher/src/mainwindow.cpp | 2 +- mdlviewer/src/mainwindow.cpp | 2 +- parts/cmp/cmppart.cpp | 1 + parts/exd/exdpart.cpp | 16 +++++----- parts/hex/document/buffer/qhexbuffer.cpp | 8 ++--- parts/hex/document/buffer/qhexbuffer.h | 8 ++--- parts/hex/document/buffer/qmemorybuffer.cpp | 4 +-- parts/hex/document/buffer/qmemorybuffer.h | 4 +-- .../hex/document/buffer/qmemoryrefbuffer.cpp | 4 +-- parts/hex/document/buffer/qmemoryrefbuffer.h | 4 +-- parts/hex/document/qhexdocument.cpp | 8 ++++- parts/hex/document/qhexdocument.h | 6 ++-- parts/hex/qhexview.h | 20 ++++++------- parts/mdl/mdlexport.cpp | 18 +++++------ parts/mdl/mdlimport.cpp | 3 +- parts/mdl/mdlpart.cpp | 18 +++++------ parts/mdl/vulkanwindow.cpp | 4 ++- parts/sklb/sklbpart.cpp | 4 +-- renderer/CMakeLists.txt | 3 +- renderer/include/renderer.hpp | 2 +- renderer/src/renderer.cpp | 18 ++++++----- sagasu/src/filetreemodel.cpp | 3 +- sagasu/src/filetreewindow.cpp | 2 +- sagasu/src/indexer.cpp | 6 ++-- sagasu/src/mainwindow.cpp | 2 +- 36 files changed, 134 insertions(+), 118 deletions(-) diff --git a/argcracker/CMakeLists.txt b/argcracker/CMakeLists.txt index 4f2257e..6f6bfc9 100644 --- a/argcracker/CMakeLists.txt +++ b/argcracker/CMakeLists.txt @@ -10,7 +10,6 @@ target_link_libraries(novus-argcracker Physis::Physis Qt6::Core Qt6::Core5Compat) -target_include_directories(novus-argcracker PUBLIC include) if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") target_compile_definitions(novus-argcracker PUBLIC MACOS) diff --git a/armoury/src/fullmodelviewer.cpp b/armoury/src/fullmodelviewer.cpp index 1f28fba..0e17979 100644 --- a/armoury/src/fullmodelviewer.cpp +++ b/armoury/src/fullmodelviewer.cpp @@ -30,7 +30,7 @@ FullModelViewer::FullModelViewer(GameData *data, FileCache &cache, QWidget *pare auto datOpenAction = fileMenu->addAction(QStringLiteral("Load character DAT...")); datOpenAction->setIcon(QIcon::fromTheme(QStringLiteral("document-open"))); - connect(datOpenAction, &QAction::triggered, [=] { + connect(datOpenAction, &QAction::triggered, [this] { auto fileName = QFileDialog::getOpenFileName(nullptr, QStringLiteral("Open DAT File"), QStringLiteral("~"), QStringLiteral("FFXIV Character DAT File (*.dat)")); @@ -210,7 +210,7 @@ void FullModelViewer::reloadGear() void FullModelViewer::updateHeightScaling(float scale) { auto &boneData = *gearView->part().skeleton; - for (int i = 0; i < boneData.num_bones; i++) { + for (uint32_t i = 0; i < boneData.num_bones; i++) { const std::string_view name{boneData.bones[i].name}; if (name == "n_root") { auto racialScaling = physis_cmp_get_racial_scaling_parameters(cmp, gearView->currentRace, gearView->currentSubrace); @@ -234,7 +234,7 @@ void FullModelViewer::updateHeightScaling(float scale) void FullModelViewer::updateBustScaling(float scale) { auto &boneData = *gearView->part().skeleton; - for (int i = 0; i < boneData.num_bones; i++) { + for (uint32_t i = 0; i < boneData.num_bones; i++) { const std::string_view name{boneData.bones[i].name}; if (name == "j_mune_l" || name == "j_mune_r") { auto racialScaling = physis_cmp_get_racial_scaling_parameters(cmp, gearView->currentRace, gearView->currentSubrace); @@ -275,19 +275,19 @@ QGroupBox *FullModelViewer::addFaceGroup() faceGroup->setLayout(faceGroupLayout); auto faceRadio1 = new QRadioButton(QStringLiteral("Face 1")); - connect(faceRadio1, &QRadioButton::clicked, this, [=] { + connect(faceRadio1, &QRadioButton::clicked, this, [this] { gearView->setFace(1); }); faceGroupLayout->addWidget(faceRadio1); auto faceRadio2 = new QRadioButton(QStringLiteral("Face 2")); - connect(faceRadio2, &QRadioButton::clicked, this, [=] { + connect(faceRadio2, &QRadioButton::clicked, this, [this] { gearView->setFace(2); }); faceGroupLayout->addWidget(faceRadio2); auto faceRadio3 = new QRadioButton(QStringLiteral("Face 3")); - connect(faceRadio3, &QRadioButton::clicked, this, [=] { + connect(faceRadio3, &QRadioButton::clicked, this, [this] { gearView->setFace(3); }); faceGroupLayout->addWidget(faceRadio3); @@ -302,19 +302,19 @@ QGroupBox *FullModelViewer::addHairGroup() hairGroup->setLayout(hairGroupLayout); auto hairRadio1 = new QRadioButton(QStringLiteral("Hair 1")); - connect(hairRadio1, &QRadioButton::clicked, this, [=] { + connect(hairRadio1, &QRadioButton::clicked, this, [this] { gearView->setHair(1); }); hairGroupLayout->addWidget(hairRadio1); auto hairRadio2 = new QRadioButton(QStringLiteral("Hair 2")); - connect(hairRadio2, &QRadioButton::clicked, this, [=] { + connect(hairRadio2, &QRadioButton::clicked, this, [this] { gearView->setHair(2); }); hairGroupLayout->addWidget(hairRadio2); auto hairRadio3 = new QRadioButton(QStringLiteral("Hair 3")); - connect(hairRadio3, &QRadioButton::clicked, this, [=] { + connect(hairRadio3, &QRadioButton::clicked, this, [this] { gearView->setHair(3); }); hairGroupLayout->addWidget(hairRadio3); @@ -329,19 +329,19 @@ QGroupBox *FullModelViewer::addEarGroup() earGroup->setLayout(earGroupLayout); auto earRadio1 = new QRadioButton(QStringLiteral("Ears 1")); - connect(earRadio1, &QRadioButton::clicked, this, [=] { + connect(earRadio1, &QRadioButton::clicked, this, [this] { gearView->setEar(1); }); earGroupLayout->addWidget(earRadio1); auto earRadio2 = new QRadioButton(QStringLiteral("Ears 2")); - connect(earRadio2, &QRadioButton::clicked, this, [=] { + connect(earRadio2, &QRadioButton::clicked, this, [this] { gearView->setEar(2); }); earGroupLayout->addWidget(earRadio2); auto earRadio3 = new QRadioButton(QStringLiteral("Ears 3")); - connect(earRadio3, &QRadioButton::clicked, this, [=] { + connect(earRadio3, &QRadioButton::clicked, this, [this] { gearView->setEar(3); }); earGroupLayout->addWidget(earRadio3); @@ -356,19 +356,19 @@ QGroupBox *FullModelViewer::addTailGroup() tailGroup->setLayout(tailGroupLayout); auto tailRadio1 = new QRadioButton(QStringLiteral("Tail 1")); - connect(tailRadio1, &QRadioButton::clicked, this, [=] { + connect(tailRadio1, &QRadioButton::clicked, this, [this] { gearView->setTail(1); }); tailGroupLayout->addWidget(tailRadio1); auto tailRadio2 = new QRadioButton(QStringLiteral("Tail 2")); - connect(tailRadio2, &QRadioButton::clicked, this, [=] { + connect(tailRadio2, &QRadioButton::clicked, this, [this] { gearView->setTail(2); }); tailGroupLayout->addWidget(tailRadio2); auto tailRadio3 = new QRadioButton(QStringLiteral("Tail 3")); - connect(tailRadio3, &QRadioButton::clicked, this, [=] { + connect(tailRadio3, &QRadioButton::clicked, this, [this] { gearView->setTail(3); }); tailGroupLayout->addWidget(tailRadio3); diff --git a/armoury/src/gearlistmodel.cpp b/armoury/src/gearlistmodel.cpp index ecb8889..c2175e0 100644 --- a/armoury/src/gearlistmodel.cpp +++ b/armoury/src/gearlistmodel.cpp @@ -35,7 +35,7 @@ GearListModel::GearListModel(GameData *data, QObject *parent) connect(exdFuture, &QFutureWatcher::finished, this, &GearListModel::finished); QVector pages; - for (int i = 0; i < exh->page_count; i++) { + for (uint32_t i = 0; i < exh->page_count; i++) { pages.push_back(i); } @@ -69,6 +69,7 @@ int GearListModel::rowCount(const QModelIndex &parent) const int GearListModel::columnCount(const QModelIndex &parent) const { + Q_UNUSED(parent) return 1; } @@ -147,10 +148,10 @@ void GearListModel::exdFinished(int index) { auto exd = exdFuture->resultAt(index); - for (int i = 0; i < exd.row_count; i++) { + for (unsigned int i = 0; i < exd.row_count; i++) { const auto row = exd.row_data[i]; auto primaryModel = row.column_data[47].u_int64._0; - auto secondaryModel = row.column_data[48].u_int64._0; + // auto secondaryModel = row.column_data[48].u_int64._0; int16_t parts[4]; memcpy(parts, &primaryModel, sizeof(int16_t) * 4); diff --git a/armoury/src/gearview.cpp b/armoury/src/gearview.cpp index b830415..7c098bf 100644 --- a/armoury/src/gearview.cpp +++ b/armoury/src/gearview.cpp @@ -49,10 +49,10 @@ GearView::GearView(GameData *data, FileCache &cache, QWidget *parent) Q_EMIT loadingChanged(true); - QtConcurrent::run(QThreadPool::globalInstance(), [this] { + Q_UNUSED(QtConcurrent::run(QThreadPool::globalInstance(), [this] { updatePart(); Q_EMIT loadingChanged(false); - }); + })); } }; } @@ -61,7 +61,7 @@ std::vector> GearView::supportedRaces() const { std::vector> races; for (const auto &gear : loadedGears) { - for (const auto [race, race_name] : magic_enum::enum_entries()) { + for (const auto &[race, race_name] : magic_enum::enum_entries()) { for (const auto subrace : physis_get_supported_subraces(race).subraces) { auto equip_path = physis_build_equipment_path(gear.info.modelInfo.primaryID, race, subrace, currentGender, gear.info.slot); @@ -314,7 +314,7 @@ void GearView::updatePart() auto mdl = physis_mdl_parse(mdl_data); std::vector materials; - for (int i = 0; i < mdl.num_material_names; i++) { + for (uint32_t i = 0; i < mdl.num_material_names; i++) { const char *material_name = mdl.material_names[i]; const std::string mtrl_path = gearAddition.info.getMtrlPath(material_name); @@ -375,7 +375,7 @@ void GearView::updatePart() auto mdl = physis_mdl_parse(mdl_data); std::vector materials; - for (int i = 0; i < mdl.num_material_names; i++) { + for (uint32_t i = 0; i < mdl.num_material_names; i++) { const char *material_name = mdl.material_names[i]; const std::string skinmtrl_path = physis_build_face_material_path(physis_get_race_code(currentRace, currentSubrace, currentGender), *face, material_name); @@ -398,7 +398,7 @@ void GearView::updatePart() auto mdl = physis_mdl_parse(mdl_data); std::vector materials; - for (int i = 0; i < mdl.num_material_names; i++) { + for (uint32_t i = 0; i < mdl.num_material_names; i++) { const char *material_name = mdl.material_names[i]; const std::string skinmtrl_path = physis_build_hair_material_path(physis_get_race_code(currentRace, currentSubrace, currentGender), *hair, material_name); @@ -421,7 +421,7 @@ void GearView::updatePart() auto mdl = physis_mdl_parse(mdl_data); std::vector materials; - for (int i = 0; i < mdl.num_material_names; i++) { + for (uint32_t i = 0; i < mdl.num_material_names; i++) { const char *material_name = mdl.material_names[i]; const std::string skinmtrl_path = physis_build_ear_material_path(physis_get_race_code(currentRace, currentSubrace, currentGender), *ear, material_name); diff --git a/armoury/src/mainwindow.cpp b/armoury/src/mainwindow.cpp index 1166d6e..763708a 100644 --- a/armoury/src/mainwindow.cpp +++ b/armoury/src/mainwindow.cpp @@ -36,13 +36,13 @@ MainWindow::MainWindow(GameData *in_data) auto gearListWidget = new GearListWidget(&data); gearListWidget->setMaximumWidth(350); - connect(gearListWidget, &GearListWidget::gearSelected, this, [=](const GearInfo &gear) { + connect(gearListWidget, &GearListWidget::gearSelected, this, [this](const GearInfo &gear) { gearView->setGear(gear); }); layout->addWidget(gearListWidget); gearView = new SingleGearView(&data, cache); - connect(gearView, &SingleGearView::addToFullModelViewer, this, [=](GearInfo &info) { + connect(gearView, &SingleGearView::addToFullModelViewer, this, [this](GearInfo &info) { fullModelViewer->addGear(info); }); @@ -51,7 +51,7 @@ MainWindow::MainWindow(GameData *in_data) layout->addWidget(tabWidget); fullModelViewer = new FullModelViewer(&data, cache); - connect(fullModelViewer, &FullModelViewer::loadingChanged, this, [=](const bool loading) { + connect(fullModelViewer, &FullModelViewer::loadingChanged, this, [this](const bool loading) { gearView->setFMVAvailable(!loading); }); fullModelViewer->show(); diff --git a/armoury/src/settingswindow.cpp b/armoury/src/settingswindow.cpp index 00a39cd..c510f10 100644 --- a/armoury/src/settingswindow.cpp +++ b/armoury/src/settingswindow.cpp @@ -30,7 +30,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) outputBoxLayout->setContentsMargins(0, 0, 0, 0); KConfig config(QStringLiteral("novusrc")); - KConfigGroup game = config.group("Armoury"); + KConfigGroup game = config.group(QStringLiteral("Armoury")); m_outputLineEdit = new QLineEdit(); m_outputLineEdit->setText(game.readEntry("PenumbraOutputDirectory")); @@ -67,6 +67,6 @@ SettingsWindow::SettingsWindow(QWidget *parent) void SettingsWindow::applySettings() { KConfig config(QStringLiteral("novusrc")); - KConfigGroup game = config.group("Armoury"); + KConfigGroup game = config.group(QStringLiteral("Armoury")); game.writeEntry("PenumbraOutputDirectory", m_outputLineEdit->text()); } diff --git a/armoury/src/singlegearview.cpp b/armoury/src/singlegearview.cpp index b677ec9..8ccb16b 100644 --- a/armoury/src/singlegearview.cpp +++ b/armoury/src/singlegearview.cpp @@ -134,16 +134,16 @@ SingleGearView::SingleGearView(GameData *data, FileCache &cache, QWidget *parent Q_EMIT gotMDLPath(); } }); - connect(this, &SingleGearView::raceChanged, this, [=] { + connect(this, &SingleGearView::raceChanged, this, [this] { gearView->setRace(currentRace); }); - connect(this, &SingleGearView::subraceChanged, this, [=] { + connect(this, &SingleGearView::subraceChanged, this, [this] { gearView->setSubrace(currentSubrace); }); - connect(this, &SingleGearView::genderChanged, this, [=] { + connect(this, &SingleGearView::genderChanged, this, [this] { gearView->setGender(currentGender); }); - connect(this, &SingleGearView::levelOfDetailChanged, this, [=] { + connect(this, &SingleGearView::levelOfDetailChanged, this, [this] { gearView->setLevelOfDetail(currentLod); }); @@ -324,8 +324,8 @@ void SingleGearView::importModel(const QString &filename) gearView->part().reloadModel(0); KConfig config(QStringLiteral("novusrc")); - KConfigGroup game = config.group("Armoury"); - QString outputDirectory = game.readEntry("PenumbraOutputDirectory"); + KConfigGroup game = config.group(QStringLiteral("Armoury")); + QString outputDirectory = game.readEntry(QStringLiteral("PenumbraOutputDirectory")); auto buffer = physis_mdl_write(&mdl.model); QFile file(QStringLiteral("%1/%2").arg(outputDirectory, gearView->getLoadedGearPath())); diff --git a/common/include/novusmainwindow.h b/common/include/novusmainwindow.h index ad95605..9b88552 100644 --- a/common/include/novusmainwindow.h +++ b/common/include/novusmainwindow.h @@ -15,8 +15,11 @@ protected: virtual void setupFileMenu(QMenu *menu) { + Q_UNUSED(menu) } + virtual void setupAdditionalMenus(QMenuBar *menuBar) { + Q_UNUSED(menuBar) } }; \ No newline at end of file diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 56c141a..9724eeb 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: CC0-1.0 set(BUILD_SHARED_LIBS OFF) +add_compile_options(-w) find_package(Corrosion REQUIRED) diff --git a/extern/dxbc b/extern/dxbc index 9db1273..907b702 160000 --- a/extern/dxbc +++ b/extern/dxbc @@ -1 +1 @@ -Subproject commit 9db12735951da73adb2818c492ce70c80b663f75 +Subproject commit 907b70249bcc4c0889778b0c47902ef359afacc0 diff --git a/karuku/src/mainwindow.cpp b/karuku/src/mainwindow.cpp index 59242e1..d2eeae0 100644 --- a/karuku/src/mainwindow.cpp +++ b/karuku/src/mainwindow.cpp @@ -33,7 +33,7 @@ MainWindow::MainWindow(GameData *data) auto listWidget = new QListWidget(); auto names = physis_gamedata_get_all_sheet_names(data); - for (int i = 0; i < names.name_count; i++) { + for (uint32_t i = 0; i < names.name_count; i++) { listWidget->addItem(QString::fromStdString(names.names[i])); } diff --git a/launcher/src/mainwindow.cpp b/launcher/src/mainwindow.cpp index 410a58d..cb736e8 100644 --- a/launcher/src/mainwindow.cpp +++ b/launcher/src/mainwindow.cpp @@ -51,7 +51,7 @@ MainWindow::MainWindow() auto formLayout = new QFormLayout(); KConfig config(QStringLiteral("novusrc")); - KConfigGroup game = config.group("Game"); + KConfigGroup game = config.group(QStringLiteral("Game")); auto gameCombo = new QComboBox(); formLayout->addRow(QStringLiteral("Current Game"), gameCombo); diff --git a/mdlviewer/src/mainwindow.cpp b/mdlviewer/src/mainwindow.cpp index 2085c1b..03f7fa3 100644 --- a/mdlviewer/src/mainwindow.cpp +++ b/mdlviewer/src/mainwindow.cpp @@ -42,7 +42,7 @@ void MainWindow::setupFileMenu(QMenu *menu) { auto openMDLFile = menu->addAction(QStringLiteral("Open MDL...")); openMDLFile->setIcon(QIcon::fromTheme(QStringLiteral("document-open"))); - connect(openMDLFile, &QAction::triggered, [=] { + connect(openMDLFile, &QAction::triggered, [this] { auto fileName = QFileDialog::getOpenFileName(nullptr, QStringLiteral("Open MDL File"), QStringLiteral("~"), QStringLiteral("FFXIV Model File (*.mdl)")); auto buffer = physis_read_file(fileName.toStdString().c_str()); diff --git a/parts/cmp/cmppart.cpp b/parts/cmp/cmppart.cpp index d8b3084..6486238 100644 --- a/parts/cmp/cmppart.cpp +++ b/parts/cmp/cmppart.cpp @@ -58,6 +58,7 @@ void CmpPart::load(physis_Buffer file) raceListWidget->expandAll(); connect(raceListWidget, &QTreeWidget::itemClicked, [this](QTreeWidgetItem *item, int column) { + Q_UNUSED(column) if (auto treeData = qvariant_cast(item->data(0, Qt::UserRole))) { loadRaceData(treeData->race, treeData->subrace); } diff --git a/parts/exd/exdpart.cpp b/parts/exd/exdpart.cpp index 222e4cb..e7d61cf 100644 --- a/parts/exd/exdpart.cpp +++ b/parts/exd/exdpart.cpp @@ -75,7 +75,7 @@ void EXDPart::loadSheet(const QString &name, physis_Buffer buffer) headerFormLayout->addRow(QStringLiteral("Num Pages"), new QLabel(QString::number(exh->page_count))); headerFormLayout->addRow(QStringLiteral("Num Languages"), new QLabel(QString::number(exh->language_count))); - for (int i = 0; i < exh->page_count; i++) { + for (uint32_t i = 0; i < exh->page_count; i++) { auto tableWidget = new QTableWidget(); tableWidget->setColumnCount(exh->column_count); @@ -85,7 +85,7 @@ void EXDPart::loadSheet(const QString &name, physis_Buffer buffer) tableWidget->setRowCount(exd.row_count); - for (int z = 0; z < exd.column_count; z++) { + for (unsigned int z = 0; z < exd.column_count; z++) { auto columnData = exd.row_data[0].column_data[z]; QString columnType; @@ -125,7 +125,7 @@ void EXDPart::loadSheet(const QString &name, physis_Buffer buffer) break; } - if (definitionList.contains(z)) { + if (definitionList.contains(static_cast(z))) { columnType = definitionList[z].toObject()[QLatin1String("name")].toString(); } @@ -135,8 +135,8 @@ void EXDPart::loadSheet(const QString &name, physis_Buffer buffer) tableWidget->setHorizontalHeaderItem(z, headerItem); } - for (int j = 0; j < exd.row_count; j++) { - for (int z = 0; z < exd.column_count; z++) { + for (unsigned int j = 0; j < exd.row_count; j++) { + for (unsigned int z = 0; z < exd.column_count; z++) { auto columnData = exd.row_data[j].column_data[z]; QString columnString; @@ -185,7 +185,7 @@ void EXDPart::loadSheet(const QString &name, physis_Buffer buffer) break; } - if (definitionList.contains(z)) { + if (definitionList.contains(static_cast(z))) { auto definition = definitionList[z].toObject(); if (definition.contains(QLatin1String("converter")) && definition[QLatin1String("converter")].toObject()[QLatin1String("type")].toString() == QLatin1String("link")) { @@ -193,7 +193,7 @@ void EXDPart::loadSheet(const QString &name, physis_Buffer buffer) if (cachedExcelSheets.contains(linkName)) { auto cachedExcel = cachedExcelSheets[linkName]; - if (columnRow < cachedExcel.exd.row_count) { + if (static_cast(columnRow) < cachedExcel.exd.row_count) { columnString = QString::fromStdString(cachedExcel.exd.row_data[columnRow].column_data->string._0); } } @@ -214,7 +214,7 @@ void EXDPart::loadSheet(const QString &name, physis_Buffer buffer) Language EXDPart::getSuitableLanguage(physis_EXH *pExh) { - for (int i = 0; i < pExh->language_count; i++) { + for (uint32_t i = 0; i < pExh->language_count; i++) { if (pExh->languages[i] == Language::English) { return Language::English; } diff --git a/parts/hex/document/buffer/qhexbuffer.cpp b/parts/hex/document/buffer/qhexbuffer.cpp index 671d0a7..ed001fe 100644 --- a/parts/hex/document/buffer/qhexbuffer.cpp +++ b/parts/hex/document/buffer/qhexbuffer.cpp @@ -24,7 +24,7 @@ void QHexBuffer::replace(qint64 offset, const QByteArray &data) this->insert(offset, data); } -void QHexBuffer::read(char *data, int size) +void QHexBuffer::readRaw(char *data, int size) { QBuffer *buffer = new QBuffer(this); buffer->setData(data, size); @@ -32,10 +32,10 @@ void QHexBuffer::read(char *data, int size) if (!buffer->isOpen()) buffer->open(QBuffer::ReadWrite); - this->read(buffer); + this->readDevice(buffer); } -void QHexBuffer::read(const QByteArray &ba) +void QHexBuffer::readArray(const QByteArray &ba) { QBuffer *buffer = new QBuffer(this); @@ -43,7 +43,7 @@ void QHexBuffer::read(const QByteArray &ba) if (!buffer->isOpen()) buffer->open(QBuffer::ReadWrite); - this->read(buffer); + this->readDevice(buffer); } #include "moc_qhexbuffer.cpp" diff --git a/parts/hex/document/buffer/qhexbuffer.h b/parts/hex/document/buffer/qhexbuffer.h index 05fd104..2006775 100644 --- a/parts/hex/document/buffer/qhexbuffer.h +++ b/parts/hex/document/buffer/qhexbuffer.h @@ -17,16 +17,16 @@ public: public: virtual uchar at(qint64 idx); virtual void replace(qint64 offset, const QByteArray &data); - virtual void read(char *data, int size); - virtual void read(const QByteArray &ba); + virtual void readRaw(char *data, int size); + virtual void readArray(const QByteArray &ba); public: virtual qint64 length() const = 0; virtual void insert(qint64 offset, const QByteArray &data) = 0; virtual void remove(qint64 offset, int length) = 0; virtual QByteArray read(qint64 offset, int length) = 0; - virtual bool read(QIODevice *iodevice) = 0; - virtual void write(QIODevice *iodevice) = 0; + virtual bool readDevice(QIODevice *iodevice) = 0; + virtual void writeDevice(QIODevice *iodevice) = 0; virtual qint64 indexOf(const QByteArray &ba, qint64 from) = 0; virtual qint64 lastIndexOf(const QByteArray &ba, qint64 from) = 0; diff --git a/parts/hex/document/buffer/qmemorybuffer.cpp b/parts/hex/document/buffer/qmemorybuffer.cpp index 64e7912..f8d103b 100644 --- a/parts/hex/document/buffer/qmemorybuffer.cpp +++ b/parts/hex/document/buffer/qmemorybuffer.cpp @@ -28,12 +28,12 @@ QByteArray QMemoryBuffer::read(qint64 offset, int length) return m_buffer.mid(static_cast(offset), length); } -bool QMemoryBuffer::read(QIODevice *device) +bool QMemoryBuffer::readDevice(QIODevice *device) { m_buffer = device->readAll(); return true; } -void QMemoryBuffer::write(QIODevice *device) +void QMemoryBuffer::writeDevice(QIODevice *device) { device->write(m_buffer); } diff --git a/parts/hex/document/buffer/qmemorybuffer.h b/parts/hex/document/buffer/qmemorybuffer.h index 973cbb6..dd1c7c4 100644 --- a/parts/hex/document/buffer/qmemorybuffer.h +++ b/parts/hex/document/buffer/qmemorybuffer.h @@ -16,8 +16,8 @@ public: void insert(qint64 offset, const QByteArray &data) override; void remove(qint64 offset, int length) override; QByteArray read(qint64 offset, int length) override; - bool read(QIODevice *device) override; - void write(QIODevice *device) override; + bool readDevice(QIODevice *device) override; + void writeDevice(QIODevice *device) override; qint64 indexOf(const QByteArray &ba, qint64 from) override; qint64 lastIndexOf(const QByteArray &ba, qint64 from) override; diff --git a/parts/hex/document/buffer/qmemoryrefbuffer.cpp b/parts/hex/document/buffer/qmemoryrefbuffer.cpp index a358906..1caa91d 100644 --- a/parts/hex/document/buffer/qmemoryrefbuffer.cpp +++ b/parts/hex/document/buffer/qmemoryrefbuffer.cpp @@ -33,7 +33,7 @@ QByteArray QMemoryRefBuffer::read(qint64 offset, int length) return m_buffer->read(length); } -bool QMemoryRefBuffer::read(QIODevice *device) +bool QMemoryRefBuffer::readDevice(QIODevice *device) { m_buffer = qobject_cast(device); if (m_buffer) { @@ -43,7 +43,7 @@ bool QMemoryRefBuffer::read(QIODevice *device) return false; } -void QMemoryRefBuffer::write(QIODevice *device) +void QMemoryRefBuffer::writeDevice(QIODevice *device) { m_buffer->seek(0); if (m_buffer->size() < INT_MAX) { diff --git a/parts/hex/document/buffer/qmemoryrefbuffer.h b/parts/hex/document/buffer/qmemoryrefbuffer.h index 563fc79..78a8263 100644 --- a/parts/hex/document/buffer/qmemoryrefbuffer.h +++ b/parts/hex/document/buffer/qmemoryrefbuffer.h @@ -16,8 +16,8 @@ public: void insert(qint64 offset, const QByteArray &data) override; void remove(qint64 offset, int length) override; QByteArray read(qint64 offset, int length) override; - bool read(QIODevice *device) override; - void write(QIODevice *device) override; + bool readDevice(QIODevice *device) override; + void writeDevice(QIODevice *device) override; qint64 indexOf(const QByteArray &ba, qint64 from) override; qint64 lastIndexOf(const QByteArray &ba, qint64 from) override; diff --git a/parts/hex/document/qhexdocument.cpp b/parts/hex/document/qhexdocument.cpp index 4a841c8..c560830 100644 --- a/parts/hex/document/qhexdocument.cpp +++ b/parts/hex/document/qhexdocument.cpp @@ -186,16 +186,22 @@ void QHexDocument::replace(qint64 offset, uchar b) void QHexDocument::insert(qint64 offset, const QByteArray &data) { + Q_UNUSED(offset) + Q_UNUSED(data) Q_EMIT documentChanged(); } void QHexDocument::replace(qint64 offset, const QByteArray &data) { + Q_UNUSED(offset) + Q_UNUSED(data) Q_EMIT documentChanged(); } void QHexDocument::remove(qint64 offset, int len) { + Q_UNUSED(offset) + Q_UNUSED(len) Q_EMIT documentChanged(); } @@ -209,7 +215,7 @@ bool QHexDocument::saveTo(QIODevice *device) if (!device->isWritable()) return false; - m_buffer->write(device); + m_buffer->writeDevice(device); return true; } diff --git a/parts/hex/document/qhexdocument.h b/parts/hex/document/qhexdocument.h index b927a37..fab1d2d 100644 --- a/parts/hex/document/qhexdocument.h +++ b/parts/hex/document/qhexdocument.h @@ -92,7 +92,7 @@ QHexDocument *QHexDocument::fromDevice(QIODevice *iodevice, QObject *parent) } QHexBuffer *hexbuffer = new T(); - if (hexbuffer->read(iodevice)) { + if (hexbuffer->readDevice(iodevice)) { if (needsclose) iodevice->close(); @@ -119,7 +119,7 @@ template QHexDocument *QHexDocument::fromMemory(char *data, int size, QObject *parent) { QHexBuffer *hexbuffer = new T(); - hexbuffer->read(data, size); + hexbuffer->readRaw(data, size); return new QHexDocument(hexbuffer, parent); } @@ -127,6 +127,6 @@ template QHexDocument *QHexDocument::fromMemory(const QByteArray &ba, QObject *parent) { QHexBuffer *hexbuffer = new T(); - hexbuffer->read(ba); + hexbuffer->readArray(ba); return new QHexDocument(hexbuffer, parent); } diff --git a/parts/hex/qhexview.h b/parts/hex/qhexview.h index 80e62c6..a5d5e47 100644 --- a/parts/hex/qhexview.h +++ b/parts/hex/qhexview.h @@ -19,16 +19,16 @@ public: void setReadOnly(bool b); protected: - virtual bool event(QEvent *e); - virtual void keyPressEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void focusInEvent(QFocusEvent *e); - virtual void focusOutEvent(QFocusEvent *e); - virtual void wheelEvent(QWheelEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual void paintEvent(QPaintEvent *e); + bool event(QEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; + void wheelEvent(QWheelEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void paintEvent(QPaintEvent *e) override; private Q_SLOTS: void renderCurrentLine(); diff --git a/parts/mdl/mdlexport.cpp b/parts/mdl/mdlexport.cpp index c5b6ea7..71b35bf 100644 --- a/parts/mdl/mdlexport.cpp +++ b/parts/mdl/mdlexport.cpp @@ -21,12 +21,12 @@ void exportModel(const QString &name, const physis_MDL &model, const physis_Skel auto &gltfSkeletonNode = gltfModel.nodes.emplace_back(); gltfSkeletonNode.name = skeleton.root_bone->name; - for (int i = 0; i < model.num_affected_bones; i++) { + for (uint32_t i = 0; i < model.num_affected_bones; i++) { auto &node = gltfModel.nodes.emplace_back(); node.name = model.affected_bone_names[i]; int real_bone_id = 0; - for (int k = 0; k < skeleton.num_bones; k++) { + for (uint32_t k = 0; k < skeleton.num_bones; k++) { if (strcmp(skeleton.bones[k].name, model.affected_bone_names[i]) == 0) { real_bone_id = k; } @@ -39,9 +39,9 @@ void exportModel(const QString &name, const physis_MDL &model, const physis_Skel } // setup parenting - for (int i = 0; i < model.num_affected_bones; i++) { + for (uint32_t i = 0; i < model.num_affected_bones; i++) { int real_bone_id = 0; - for (int k = 0; k < skeleton.num_bones; k++) { + for (uint32_t k = 0; k < skeleton.num_bones; k++) { if (strcmp(skeleton.bones[k].name, model.affected_bone_names[i]) == 0) { real_bone_id = k; } @@ -50,7 +50,7 @@ void exportModel(const QString &name, const physis_MDL &model, const physis_Skel auto &real_bone = skeleton.bones[real_bone_id]; if (real_bone.parent_bone != nullptr) { bool found = false; - for (int k = 0; k < model.num_affected_bones; k++) { + for (uint32_t k = 0; k < model.num_affected_bones; k++) { if (strcmp(model.affected_bone_names[k], real_bone.parent_bone->name) == 0) { gltfModel.nodes[k + 1].children.push_back(i + 1); // +1 for the skeleton node taking up the first index found = true; @@ -70,7 +70,7 @@ void exportModel(const QString &name, const physis_MDL &model, const physis_Skel auto &gltfSkin = gltfModel.skins.emplace_back(); gltfSkin.name = gltfSkeletonNode.name; gltfSkin.skeleton = 0; - for (int i = 1; i < gltfModel.nodes.size(); i++) { + for (size_t i = 1; i < gltfModel.nodes.size(); i++) { gltfSkin.joints.push_back(i); } @@ -88,9 +88,9 @@ void exportModel(const QString &name, const physis_MDL &model, const physis_Skel inverseBufferView.buffer = gltfModel.buffers.size(); auto &inverseBuffer = gltfModel.buffers.emplace_back(); - for (int i = 0; i < model.num_affected_bones; i++) { + for (uint32_t i = 0; i < model.num_affected_bones; i++) { int real_bone_id = 0; - for (int k = 0; k < skeleton.num_bones; k++) { + for (uint32_t k = 0; k < skeleton.num_bones; k++) { if (strcmp(skeleton.bones[k].name, model.affected_bone_names[i]) == 0) { real_bone_id = k; } @@ -106,7 +106,7 @@ void exportModel(const QString &name, const physis_MDL &model, const physis_Skel inverseBufferView.byteLength = inverseBuffer.data.size(); } - for (int i = 0; i < lod.num_parts; i++) { + for (uint32_t i = 0; i < lod.num_parts; i++) { gltfSkeletonNode.children.push_back(gltfModel.nodes.size()); auto &gltfNode = gltfModel.nodes.emplace_back(); diff --git a/parts/mdl/mdlimport.cpp b/parts/mdl/mdlimport.cpp index ed64c0c..fc50bd6 100644 --- a/parts/mdl/mdlimport.cpp +++ b/parts/mdl/mdlimport.cpp @@ -30,7 +30,6 @@ void importModel(physis_MDL &existingModel, const QString &filename) qInfo() << "Importing" << node.name; const QStringList parts = QString::fromStdString(node.name).split(QLatin1Char(' ')); - const QString &name = parts[0]; const QStringList lodPartNumber = parts[2].split(QLatin1Char('.')); // const int lodNumber = lodPartNumber[0].toInt(); @@ -69,7 +68,7 @@ void importModel(physis_MDL &existingModel, const QString &filename) qInfo() << "- Importing mesh of" << vertexAccessor.count << "vertices and" << indexAccessor.count << "indices."; std::vector newVertices; - for (int i = 0; i < vertexAccessor.count; i++) { + for (uint32_t i = 0; i < vertexAccessor.count; i++) { auto vertexData = (glm::vec3 *)(vertexBuffer.data.data() + (std::max(vertexView.byteStride, sizeof(float) * 3) * i) + vertexView.byteOffset + vertexAccessor.byteOffset); diff --git a/parts/mdl/mdlpart.cpp b/parts/mdl/mdlpart.cpp index 078cab8..d4bc531 100644 --- a/parts/mdl/mdlpart.cpp +++ b/parts/mdl/mdlpart.cpp @@ -140,8 +140,8 @@ void MDLPart::reloadBoneData() for (auto &model : models) { // we want to map the actual affected bones to bone ids std::map boneMapping; - for (int i = 0; i < model.model.num_affected_bones; i++) { - for (int k = 0; k < skeleton->num_bones; k++) { + for (uint32_t i = 0; i < model.model.num_affected_bones; i++) { + for (uint32_t k = 0; k < skeleton->num_bones; k++) { if (std::string_view{skeleton->bones[k].name} == std::string_view{model.model.affected_bone_names[i]}) { boneMapping[i] = k; } @@ -149,7 +149,7 @@ void MDLPart::reloadBoneData() } std::vector deformBones(model.model.num_affected_bones); - for (int i = 0; i < model.model.num_affected_bones; i++) { + for (uint32_t i = 0; i < model.model.num_affected_bones; i++) { deformBones[i] = glm::mat4(1.0f); } @@ -159,7 +159,7 @@ void MDLPart::reloadBoneData() for (int i = 0; i < deform.num_bones; i++) { auto deformBone = deform.bones[i]; - for (int k = 0; k < model.model.num_affected_bones; k++) { + for (uint32_t k = 0; k < model.model.num_affected_bones; k++) { if (std::string_view{model.model.affected_bone_names[k]} == std::string_view{deformBone.name}) { deformBones[k] = glm::mat4{deformBone.deform[0], deformBone.deform[1], @@ -182,7 +182,7 @@ void MDLPart::reloadBoneData() } } - for (int i = 0; i < model.model.num_affected_bones; i++) { + for (uint32_t i = 0; i < model.model.num_affected_bones; i++) { const int originalBoneId = boneMapping[i]; model.boneData[i] = boneData[originalBoneId].localTransform * deformBones[i] * boneData[originalBoneId].inversePose; } @@ -194,7 +194,7 @@ RenderMaterial MDLPart::createMaterial(const physis_Material &material) { RenderMaterial newMaterial; - for (int i = 0; i < material.num_textures; i++) { + for (uint32_t i = 0; i < material.num_textures; i++) { std::string t = material.textures[i]; if (t.find("skin") != std::string::npos) { @@ -209,7 +209,7 @@ RenderMaterial MDLPart::createMaterial(const physis_Material &material) auto tex = renderer->addTexture(texture.width, texture.height, texture.rgba, texture.rgba_size); newMaterial.multiTexture = new RenderTexture(tex); - } + } break; case 'd': { auto texture = physis_texture_parse(cache.lookupFile(QLatin1String(material.textures[i]))); auto tex = renderer->addTexture(texture.width, texture.height, texture.rgba, texture.rgba_size); @@ -248,7 +248,7 @@ void MDLPart::calculateBoneInversePose(physis_Skeleton &skeleton, physis_Bone &b boneData[bone.index].inversePose = parentMatrix * local; - for (int i = 0; i < skeleton.num_bones; i++) { + for (uint32_t i = 0; i < skeleton.num_bones; i++) { if (skeleton.bones[i].parent_bone != nullptr && std::string_view{skeleton.bones[i].parent_bone->name} == std::string_view{bone.name}) { calculateBoneInversePose(skeleton, skeleton.bones[i], &bone); } @@ -267,7 +267,7 @@ void MDLPart::calculateBone(physis_Skeleton &skeleton, physis_Bone &bone, const boneData[bone.index].localTransform = parent_matrix * local; boneData[bone.index].finalTransform = parent_matrix; - for (int i = 0; i < skeleton.num_bones; i++) { + for (uint32_t i = 0; i < skeleton.num_bones; i++) { if (skeleton.bones[i].parent_bone != nullptr && std::string_view{skeleton.bones[i].parent_bone->name} == std::string_view{bone.name}) { calculateBone(skeleton, skeleton.bones[i], &bone); } diff --git a/parts/mdl/vulkanwindow.cpp b/parts/mdl/vulkanwindow.cpp index 363fa32..7b0b577 100644 --- a/parts/mdl/vulkanwindow.cpp +++ b/parts/mdl/vulkanwindow.cpp @@ -76,7 +76,7 @@ bool VulkanWindow::event(QEvent *e) part->cameraDistance * part->pitch, part->cameraDistance * std::cos(part->yaw)); - const glm::quat rot = glm::quatLookAt((part->position + position) - part->position, {0, 1, 0}); + // const glm::quat rot = glm::quatLookAt((part->position + position) - part->position, {0, 1, 0}); part->position += glm::vec3{0, 1, 0} * (float)deltaY * 0.01f; part->position.y = std::clamp(part->position.y, 0.0f, 10.0f); @@ -92,6 +92,8 @@ bool VulkanWindow::event(QEvent *e) part->cameraDistance -= (scrollEvent->angleDelta().y() / 120.0f) * 0.1f; // FIXME: why 120? part->cameraDistance = std::clamp(part->cameraDistance, 1.0f, 4.0f); } break; + default: + break; } return QWindow::event(e); diff --git a/parts/sklb/sklbpart.cpp b/parts/sklb/sklbpart.cpp index cf64866..20bd7f2 100644 --- a/parts/sklb/sklbpart.cpp +++ b/parts/sklb/sklbpart.cpp @@ -22,7 +22,7 @@ void addItem(physis_Skeleton &skeleton, physis_Bone &bone, QTreeWidget *widget, parent_item->addChild(item); } - for (int i = 0; i < skeleton.num_bones; i++) { + for (uint32_t i = 0; i < skeleton.num_bones; i++) { if (skeleton.bones[i].parent_bone != nullptr && strcmp(skeleton.bones[i].parent_bone->name, bone.name) == 0) addItem(skeleton, skeleton.bones[i], widget, item); } @@ -74,7 +74,7 @@ SklbPart::SklbPart(QWidget *parent) void SklbPart::treeItemClicked(QTreeWidgetItem *item, int column) { - for (int i = 0; i < skeleton.num_bones; i++) { + for (uint32_t i = 0; i < skeleton.num_bones; i++) { if (strcmp(skeleton.bones[i].name, item->text(column).toStdString().c_str()) == 0) { currentPosition = glm::make_vec3(skeleton.bones[i].position); currentRotation = glm::make_quat(skeleton.bones[i].rotation); diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt index ac33899..c4cdec5 100644 --- a/renderer/CMakeLists.txt +++ b/renderer/CMakeLists.txt @@ -3,6 +3,7 @@ add_library(renderer STATIC) target_sources(renderer PRIVATE + include/renderer.hpp src/renderer.cpp src/imguipass.cpp src/imguipass.h) @@ -13,7 +14,7 @@ qt_add_resources(renderer "shaders" shaders/imgui.vert.spv shaders/mesh.frag.spv shaders/mesh.vert.spv) -target_include_directories(renderer PUBLIC include) +target_include_directories(renderer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_link_libraries(renderer PUBLIC Qt6::Core Vulkan::Vulkan diff --git a/renderer/include/renderer.hpp b/renderer/include/renderer.hpp index ee5dc17..edec2ed 100644 --- a/renderer/include/renderer.hpp +++ b/renderer/include/renderer.hpp @@ -69,7 +69,7 @@ public: void resize(VkSurfaceKHR surface, int width, int height); RenderModel addModel(const physis_MDL &model, int lod); - void reloadModel(RenderModel &model, int lod); + void reloadModel(RenderModel &model, uint32_t lod); RenderTexture addTexture(uint32_t width, uint32_t height, const uint8_t *data, uint32_t data_size); void render(std::vector models); diff --git a/renderer/src/renderer.cpp b/renderer/src/renderer.cpp index 7b10944..4ed5672 100644 --- a/renderer/src/renderer.cpp +++ b/renderer/src/renderer.cpp @@ -36,6 +36,10 @@ VKAPI_ATTR VkBool32 VKAPI_CALL DebugCallback(VkDebugUtilsMessageSeverityFlagBits const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData, void *pUserData) { + Q_UNUSED(messageSeverity) + Q_UNUSED(messageType) + Q_UNUSED(pUserData) + qInfo() << pCallbackData->pMessage; return VK_FALSE; @@ -52,8 +56,6 @@ Renderer::Renderer() ImGui::StyleColorsDark(); - VkApplicationInfo applicationInfo = {}; - std::vector instanceExtensions = {"VK_EXT_debug_utils"}; uint32_t extensionCount = 0; @@ -189,8 +191,6 @@ Renderer::Renderer() deviceCeateInfo.ppEnabledExtensionNames = deviceExtensions.data(); deviceCeateInfo.enabledExtensionCount = static_cast(deviceExtensions.size()); - VkPhysicalDeviceFeatures enabledFeatures = {}; - vkCreateDevice(physicalDevice, &deviceCeateInfo, nullptr, &device); // get queues @@ -488,7 +488,7 @@ void Renderer::render(std::vector models) continue; for (const auto &part : model.parts) { - if (part.materialIndex >= model.materials.size()) { + if (static_cast(part.materialIndex) >= model.materials.size()) { continue; } @@ -643,14 +643,14 @@ RenderModel Renderer::addModel(const physis_MDL &model, int lod) return renderModel; } -void Renderer::reloadModel(RenderModel &renderModel, int lod) +void Renderer::reloadModel(RenderModel &renderModel, uint32_t lod) { - if (lod < 0 || lod > renderModel.model.num_lod) + if (lod > renderModel.model.num_lod) return; renderModel.parts.clear(); - for (int i = 0; i < renderModel.model.lods[lod].num_parts; i++) { + for (uint32_t i = 0; i < renderModel.model.lods[lod].num_parts; i++) { RenderPart renderPart; const physis_Part part = renderModel.model.lods[lod].parts[i]; @@ -1173,6 +1173,8 @@ void Renderer::inlineTransitionImageLayout(VkCommandBuffer commandBuffer, VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask) { + Q_UNUSED(format) + VkImageMemoryBarrier barrier = {}; barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.oldLayout = oldLayout; diff --git a/sagasu/src/filetreemodel.cpp b/sagasu/src/filetreemodel.cpp index b7079ed..534581e 100644 --- a/sagasu/src/filetreemodel.cpp +++ b/sagasu/src/filetreemodel.cpp @@ -25,7 +25,7 @@ FileTreeModel::FileTreeModel(bool showUnknown, const QString &gamePath, GameData if (info.exists() && (info.completeSuffix() == QStringLiteral("win32.index"))) { std::string pathStd = info.filePath().toStdString(); auto indexEntries = physis_index_parse(pathStd.c_str()); - for (int i = 0; i < indexEntries.num_entries; i++) { + for (uint32_t i = 0; i < indexEntries.num_entries; i++) { if (knownDirHashes.contains(indexEntries.dir_entries[i])) { QString name; if (m_database.knowsFile(indexEntries.filename_entries[i])) { @@ -56,6 +56,7 @@ int FileTreeModel::rowCount(const QModelIndex &parent) const int FileTreeModel::columnCount(const QModelIndex &parent) const { + Q_UNUSED(parent) return 1; } diff --git a/sagasu/src/filetreewindow.cpp b/sagasu/src/filetreewindow.cpp index 161cd39..64f4a69 100644 --- a/sagasu/src/filetreewindow.cpp +++ b/sagasu/src/filetreewindow.cpp @@ -53,7 +53,7 @@ FileTreeWindow::FileTreeWindow(const QString &gamePath, GameData *data, QWidget auto menu = new QMenu(); auto extractAction = menu->addAction(QStringLiteral("Extract..")); - connect(extractAction, &QAction::triggered, this, [=] { + connect(extractAction, &QAction::triggered, this, [this, path] { Q_EMIT extractFile(path); }); diff --git a/sagasu/src/indexer.cpp b/sagasu/src/indexer.cpp index e40b305..5dd90df 100644 --- a/sagasu/src/indexer.cpp +++ b/sagasu/src/indexer.cpp @@ -185,7 +185,7 @@ int main(int argc, char *argv[]) auto sheetNames = physis_gamedata_get_all_sheet_names(data); - for (int i = 0; i < sheetNames.name_count; i++) { + for (uint32_t i = 0; i < sheetNames.name_count; i++) { auto sheetName = sheetNames.names[i]; auto nameLowercase = QString::fromStdString(sheetName).toLower().toStdString(); @@ -195,8 +195,8 @@ int main(int argc, char *argv[]) std::string headerNameStd = headerName.toStdString(); auto exh = physis_parse_excel_sheet_header(physis_gamedata_extract_file(data, headerNameStd.c_str())); - for (int j = 0; j < exh->page_count; j++) { - for (int z = 0; z < exh->language_count; z++) { + for (uint32_t j = 0; j < exh->page_count; j++) { + for (uint32_t z = 0; z < exh->language_count; z++) { std::string path = physis_gamedata_get_exd_filename(nameLowercase.c_str(), exh, exh->languages[z], j); database.addFile(QStringLiteral("exd/") + QString::fromStdString(path)); diff --git a/sagasu/src/mainwindow.cpp b/sagasu/src/mainwindow.cpp index c7bf5bf..1f38992 100644 --- a/sagasu/src/mainwindow.cpp +++ b/sagasu/src/mainwindow.cpp @@ -50,7 +50,7 @@ MainWindow::MainWindow(const QString &gamePath, GameData *data) file.write(reinterpret_cast(fileData.data), fileData.size); } }); - connect(tree, &FileTreeWindow::pathSelected, this, [=](const QString &path) { + connect(tree, &FileTreeWindow::pathSelected, this, [this](const QString &path) { refreshParts(path); }); tree->setMaximumWidth(200);