From ec4b36b29947af9dc169048b5dd519b685c70977 Mon Sep 17 00:00:00 2001 From: Octol1ttle Date: Wed, 25 Feb 2026 15:37:20 +0500 Subject: [PATCH] Fix compiler warnings Signed-off-by: Octol1ttle --- launcher/Application.cpp | 2 +- launcher/FileSystem.cpp | 3 +++ launcher/InstanceList.cpp | 8 ++++---- launcher/InstanceList.h | 2 +- launcher/Json.cpp | 2 +- launcher/java/JavaInstall.cpp | 4 ++-- launcher/java/JavaMetadata.cpp | 4 ++-- launcher/minecraft/ComponentUpdateTask.cpp | 2 +- launcher/minecraft/ComponentUpdateTask.h | 2 +- launcher/minecraft/World.cpp | 4 ++-- launcher/minecraft/auth/MinecraftAccount.cpp | 12 ++++++------ launcher/minecraft/mod/ModFolderModel.cpp | 1 - .../minecraft/mod/tasks/LocalModParseTask.cpp | 17 +++++++---------- .../modplatform/flame/FlamePackExportTask.cpp | 8 ++++---- .../modplatform/flame/FlamePackExportTask.h | 2 +- .../modrinth/ModrinthCheckUpdate.cpp | 5 +---- launcher/ui/dialogs/skins/draw/BoxGeometry.cpp | 8 ++++---- launcher/ui/dialogs/skins/draw/Scene.cpp | 10 +++++----- .../ui/dialogs/skins/draw/SkinOpenGLWindow.cpp | 4 ++-- launcher/ui/instanceview/VisualGroup.cpp | 4 ++-- launcher/ui/pages/modplatform/ResourcePage.cpp | 5 ++--- launcher/ui/pages/modplatform/ftb/FtbPage.cpp | 12 ++++++------ launcher/ui/pages/modplatform/ftb/FtbPage.h | 4 ++-- launcher/ui/widgets/JavaWizardWidget.cpp | 3 --- .../updater/prismupdater/UpdaterDialogs.cpp | 4 ++-- 25 files changed, 62 insertions(+), 70 deletions(-) diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 740141f9c..d39348e8d 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -392,7 +392,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv) } else { QDir foo; if (DesktopServices::isSnap()) { - foo = QDir(getenv("SNAP_USER_COMMON")); + foo = QDir(qEnvironmentVariable("SNAP_USER_COMMON")); } else { foo = QDir(FS::PathCombine(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), "..")); } diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp index 9ca1c5fa6..5c328c75f 100644 --- a/launcher/FileSystem.cpp +++ b/launcher/FileSystem.cpp @@ -282,6 +282,9 @@ bool copyFileAttributes(QString src, QString dst) if (attrs == INVALID_FILE_ATTRIBUTES) return false; return SetFileAttributesW(dst.toStdWString().c_str(), attrs); +#else + Q_UNUSED(src); + Q_UNUSED(dst); #endif return true; } diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp index 1542886a1..c1123679f 100644 --- a/launcher/InstanceList.cpp +++ b/launcher/InstanceList.cpp @@ -153,13 +153,13 @@ QStringList InstanceList::getLinkedInstancesById(const QString& id) const int InstanceList::rowCount(const QModelIndex& parent) const { Q_UNUSED(parent); - return m_instances.size(); + return count(); } QModelIndex InstanceList::index(int row, int column, const QModelIndex& parent) const { Q_UNUSED(parent); - if (row < 0 || static_cast(row) >= m_instances.size()) + if (row < 0 || row >= count()) return QModelIndex(); return createIndex(row, column, m_instances.at(row).get()); } @@ -579,7 +579,7 @@ void InstanceList::saveNow() void InstanceList::add(std::vector>& t) { - beginInsertRows(QModelIndex(), m_instances.size(), m_instances.size() + t.size() - 1); + beginInsertRows(QModelIndex(), count(), static_cast(count() + t.size() - 1)); for (auto& ptr : t) { m_instances.push_back(std::move(ptr)); connect(m_instances.back().get(), &BaseInstance::propertiesChanged, this, &InstanceList::propertiesChanged); @@ -644,7 +644,7 @@ QModelIndex InstanceList::getInstanceIndexById(const QString& id) const int InstanceList::getInstIndex(BaseInstance* inst) const { - int count = m_instances.size(); + int count = this->count(); for (int i = 0; i < count; i++) { if (inst == m_instances.at(i).get()) { return i; diff --git a/launcher/InstanceList.h b/launcher/InstanceList.h index d996e0865..64c950d08 100644 --- a/launcher/InstanceList.h +++ b/launcher/InstanceList.h @@ -98,7 +98,7 @@ class InstanceList : public QAbstractListModel { BaseInstance* at(int i) const { return m_instances.at(i).get(); } - int count() const { return m_instances.size(); } + qsizetype count() const { return static_cast(m_instances.size()); } InstListError loadList(); void saveNow(); diff --git a/launcher/Json.cpp b/launcher/Json.cpp index 688f9dae7..2d3372e2e 100644 --- a/launcher/Json.cpp +++ b/launcher/Json.cpp @@ -303,7 +303,7 @@ QStringList toStringList(const QString& jsonString) return {}; try { return requireIsArrayOf(doc); - } catch (Json::JsonException& e) { + } catch (Json::JsonException&) { return {}; } } diff --git a/launcher/java/JavaInstall.cpp b/launcher/java/JavaInstall.cpp index 30cb77e08..98aac5cab 100644 --- a/launcher/java/JavaInstall.cpp +++ b/launcher/java/JavaInstall.cpp @@ -49,7 +49,7 @@ bool JavaInstall::operator<(BaseVersion& a) const { try { return operator<(dynamic_cast(a)); - } catch (const std::bad_cast& e) { + } catch (const std::bad_cast&) { return BaseVersion::operator<(a); } } @@ -58,7 +58,7 @@ bool JavaInstall::operator>(BaseVersion& a) const { try { return operator>(dynamic_cast(a)); - } catch (const std::bad_cast& e) { + } catch (const std::bad_cast&) { return BaseVersion::operator>(a); } } diff --git a/launcher/java/JavaMetadata.cpp b/launcher/java/JavaMetadata.cpp index 115baa9e5..3647c963f 100644 --- a/launcher/java/JavaMetadata.cpp +++ b/launcher/java/JavaMetadata.cpp @@ -111,7 +111,7 @@ bool Metadata::operator<(BaseVersion& a) const { try { return operator<(dynamic_cast(a)); - } catch (const std::bad_cast& e) { + } catch (const std::bad_cast&) { return BaseVersion::operator<(a); } } @@ -120,7 +120,7 @@ bool Metadata::operator>(BaseVersion& a) const { try { return operator>(dynamic_cast(a)); - } catch (const std::bad_cast& e) { + } catch (const std::bad_cast&) { return BaseVersion::operator>(a); } } diff --git a/launcher/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp index d392ddb7e..ceae10dbe 100644 --- a/launcher/minecraft/ComponentUpdateTask.cpp +++ b/launcher/minecraft/ComponentUpdateTask.cpp @@ -223,7 +223,7 @@ void ComponentUpdateTask::loadComponents() componentIndex++; } d->remoteTasksInProgress = taskIndex; - m_progressTotal = taskIndex; + m_progressTotal = static_cast(taskIndex); switch (result) { case LoadResult::LoadedLocal: { // Everything got loaded. Advance to dependency resolution. diff --git a/launcher/minecraft/ComponentUpdateTask.h b/launcher/minecraft/ComponentUpdateTask.h index c4c3fd3cc..b0a6f8bff 100644 --- a/launcher/minecraft/ComponentUpdateTask.h +++ b/launcher/minecraft/ComponentUpdateTask.h @@ -21,7 +21,7 @@ class ComponentUpdateTask : public Task { bool abort() override; protected: - void executeTask(); + void executeTask() override; private: void loadComponents(); diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp index a365eafc3..f58e24b06 100644 --- a/launcher/minecraft/World.cpp +++ b/launcher/minecraft/World.cpp @@ -256,7 +256,7 @@ void World::readFromFS(const QFileInfo& file) loadFromLevelDat(bytes); m_levelDatTime = file.lastModified(); if (m_randomSeed == 0) { - auto bytes = getWorldGenDataFromFS(file); + bytes = getWorldGenDataFromFS(file); if (!bytes.isEmpty()) { m_randomSeed = loadSeed(bytes); } @@ -426,7 +426,7 @@ int64_t loadSeed(QByteArray data) nbt::value* valPtr = nullptr; try { valPtr = &levelData->at("data"); - } catch (const std::out_of_range& e) { + } catch (const std::out_of_range&) { return 0; } nbt::value& val = *valPtr; diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp index 1592a22d2..065273268 100644 --- a/launcher/minecraft/auth/MinecraftAccount.cpp +++ b/launcher/minecraft/auth/MinecraftAccount.cpp @@ -278,12 +278,12 @@ QUuid MinecraftAccount::uuidFromUsername(QString username) // basically a reimplementation of Java's UUID#nameUUIDFromBytes QByteArray digest = QCryptographicHash::hash(input, QCryptographicHash::Md5); - auto bOr = [](QByteArray& array, qsizetype index, char value) { array[index] |= value; }; - auto bAnd = [](QByteArray& array, qsizetype index, char value) { array[index] &= value; }; - bAnd(digest, 6, (char)0x0f); // clear version - bOr(digest, 6, (char)0x30); // set to version 3 - bAnd(digest, 8, (char)0x3f); // clear variant - bOr(digest, 8, (char)0x80); // set to IETF variant + auto bOr = [](QByteArray& array, qsizetype index, uint8_t value) { array[index] |= value; }; + auto bAnd = [](QByteArray& array, qsizetype index, uint8_t value) { array[index] &= value; }; + bAnd(digest, 6, 0x0f); // clear version + bOr(digest, 6, 0x30); // set to version 3 + bAnd(digest, 8, 0x3f); // clear variant + bOr(digest, 8, 0x80); // set to IETF variant return QUuid::fromRfc4122(digest); } diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp index 50b8985c8..4d54be921 100644 --- a/launcher/minecraft/mod/ModFolderModel.cpp +++ b/launcher/minecraft/mod/ModFolderModel.cpp @@ -219,7 +219,6 @@ QVariant ModFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientatio default: return QVariant(); } - return QVariant(); } int ModFolderModel::columnCount(const QModelIndex& parent) const diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp index c0807907b..5f3e43216 100644 --- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp +++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp @@ -263,12 +263,11 @@ ModDetails ReadMCModTOML(QByteArray contents) } else if (auto depTable = depValue.as_table()) { auto expectedKey = details.mod_id.toStdString(); if (!depTable->contains(expectedKey)) { - for (auto [k, v] : *depTable) { - expectedKey = k; - break; + if (auto it = depTable->begin(); it != depTable->end()) { + expectedKey = it->first; } } - if (auto array = (*depTable)[expectedKey].as_array()) { + if ((array = (*depTable)[expectedKey].as_array())) { parseDep(array); } } @@ -352,9 +351,8 @@ ModDetails ReadFabricModInfo(QByteArray contents) details.icon_file = obj.value(key).toString(); } else { // parsing the sizes failed // take the first - for (auto i : obj) { - details.icon_file = i.toString(); - break; + if (auto it = obj.begin(); it != obj.end()) { + details.icon_file = it->toString(); } } } else if (icon.isString()) { @@ -451,9 +449,8 @@ ModDetails ReadQuiltModInfo(QByteArray contents) details.icon_file = obj.value(key).toString(); } else { // parsing the sizes failed // take the first - for (auto i : obj) { - details.icon_file = i.toString(); - break; + if (auto it = obj.begin(); it != obj.end()) { + details.icon_file = it->toString(); } } } else if (icon.isString()) { diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp index 37c9380f5..dffd13e27 100644 --- a/launcher/modplatform/flame/FlamePackExportTask.cpp +++ b/launcher/modplatform/flame/FlamePackExportTask.cpp @@ -67,8 +67,8 @@ void FlamePackExportTask::collectFiles() setAbortable(false); QCoreApplication::processEvents(); - files.clear(); - if (!MMCZip::collectFileListRecursively(m_options.instance->gameRoot(), nullptr, &files, m_options.filter)) { + m_files.clear(); + if (!MMCZip::collectFileListRecursively(m_options.instance->gameRoot(), nullptr, &m_files, m_options.filter)) { emitFailed(tr("Could not search for files")); return; } @@ -88,7 +88,7 @@ void FlamePackExportTask::collectHashes() auto allMods = m_options.instance->loaderModList()->allMods(); ConcurrentTask::Ptr hashingTask(new ConcurrentTask("MakeHashesTask", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt())); task.reset(hashingTask); - for (const QFileInfo& file : files) { + for (const QFileInfo& file : m_files) { const QString relative = m_gameRoot.relativeFilePath(file.absoluteFilePath()); // require sensible file types if (!std::any_of(FILE_EXTENSIONS.begin(), FILE_EXTENSIONS.end(), [&relative](const QString& extension) { @@ -319,7 +319,7 @@ void FlamePackExportTask::buildZip() setStatus(tr("Adding files...")); setProgress(4, 5); - auto zipTask = makeShared(m_options.output, m_gameRoot, files, "overrides/", true); + auto zipTask = makeShared(m_options.output, m_gameRoot, m_files, "overrides/", true); zipTask->addExtraFile("manifest.json", generateIndex()); zipTask->addExtraFile("modlist.html", generateHTML()); diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h index f47041704..f6a90241d 100644 --- a/launcher/modplatform/flame/FlamePackExportTask.h +++ b/launcher/modplatform/flame/FlamePackExportTask.h @@ -72,7 +72,7 @@ class FlamePackExportTask : public Task { FlameAPI api; - QFileInfoList files; + QFileInfoList m_files; QMap pendingHashes{}; QMap resolvedFiles{}; Task::Ptr task; diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp index 35910338f..8d47bada7 100644 --- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp +++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp @@ -152,10 +152,7 @@ void ModrinthCheckUpdate::checkVersionsResponse(QByteArray* response, std::optio // so we may want to filter it QString loader_filter; if (loader.has_value()) { - for (auto flag : ModPlatform::modLoaderTypesToList(*loader)) { - loader_filter = ModPlatform::getModLoaderAsString(flag); - break; - } + loader_filter = ModPlatform::getModLoaderAsString(ModPlatform::modLoaderTypesToList(*loader).first()); } // Currently, we rely on a couple heuristics to determine whether an update is actually available or not: diff --git a/launcher/ui/dialogs/skins/draw/BoxGeometry.cpp b/launcher/ui/dialogs/skins/draw/BoxGeometry.cpp index 4404442a4..f1f771303 100644 --- a/launcher/ui/dialogs/skins/draw/BoxGeometry.cpp +++ b/launcher/ui/dialogs/skins/draw/BoxGeometry.cpp @@ -247,11 +247,11 @@ void BoxGeometry::initGeometry(float u, float v, float width, float height, floa // Transfer vertex data to VBO 0 m_vertexBuf.bind(); - m_vertexBuf.allocate(verticesData.constData(), verticesData.size() * sizeof(VertexData)); + m_vertexBuf.allocate(verticesData.constData(), static_cast(verticesData.size() * sizeof(VertexData))); // Transfer index data to VBO 1 m_indexBuf.bind(); - m_indexBuf.allocate(indices.constData(), indices.size() * sizeof(GLushort)); + m_indexBuf.allocate(indices.constData(), static_cast(indices.size() * sizeof(GLushort))); m_indecesCount = indices.size(); } @@ -266,11 +266,11 @@ BoxGeometry* BoxGeometry::Plane() // Transfer vertex data to VBO 0 b->m_vertexBuf.bind(); - b->m_vertexBuf.allocate(planeVertices.constData(), planeVertices.size() * sizeof(VertexData)); + b->m_vertexBuf.allocate(planeVertices.constData(), static_cast(planeVertices.size() * sizeof(VertexData))); // Transfer index data to VBO 1 b->m_indexBuf.bind(); - b->m_indexBuf.allocate(planeIndices.constData(), planeIndices.size() * sizeof(GLushort)); + b->m_indexBuf.allocate(planeIndices.constData(), static_cast(planeIndices.size() * sizeof(GLushort))); b->m_indecesCount = planeIndices.size(); return b; diff --git a/launcher/ui/dialogs/skins/draw/Scene.cpp b/launcher/ui/dialogs/skins/draw/Scene.cpp index e8ede8c24..1d06c694f 100644 --- a/launcher/ui/dialogs/skins/draw/Scene.cpp +++ b/launcher/ui/dialogs/skins/draw/Scene.cpp @@ -34,9 +34,9 @@ Scene::Scene(const QImage& skin, bool slim, const QImage& cape) : QOpenGLFunctio // body new opengl::BoxGeometry(QVector3D(8, 12, 4), QVector3D(0, -6, 0), QPoint(16, 16), QVector3D(8, 12, 4)), // right leg - new opengl::BoxGeometry(QVector3D(4, 12, 4), QVector3D(-1.9, -18, -0.1), QPoint(0, 16), QVector3D(4, 12, 4)), + new opengl::BoxGeometry(QVector3D(4, 12, 4), QVector3D(-1.9f, -18, -0.1f), QPoint(0, 16), QVector3D(4, 12, 4)), // left leg - new opengl::BoxGeometry(QVector3D(4, 12, 4), QVector3D(1.9, -18, -0.1), QPoint(16, 48), QVector3D(4, 12, 4)), + new opengl::BoxGeometry(QVector3D(4, 12, 4), QVector3D(1.9f, -18, -0.1f), QPoint(16, 48), QVector3D(4, 12, 4)), }; m_staticComponentsOverlay = { @@ -45,9 +45,9 @@ Scene::Scene(const QImage& skin, bool slim, const QImage& cape) : QOpenGLFunctio // body new opengl::BoxGeometry(QVector3D(8.5, 12.5, 4.5), QVector3D(0, -6, 0), QPoint(16, 32), QVector3D(8, 12, 4)), // right leg - new opengl::BoxGeometry(QVector3D(4.5, 12.5, 4.5), QVector3D(-1.9, -18, -0.1), QPoint(0, 32), QVector3D(4, 12, 4)), + new opengl::BoxGeometry(QVector3D(4.5f, 12.5f, 4.5f), QVector3D(-1.9f, -18, -0.1f), QPoint(0, 32), QVector3D(4, 12, 4)), // left leg - new opengl::BoxGeometry(QVector3D(4.5, 12.5, 4.5), QVector3D(1.9, -18, -0.1), QPoint(0, 48), QVector3D(4, 12, 4)), + new opengl::BoxGeometry(QVector3D(4.5f, 12.5f, 4.5f), QVector3D(1.9f, -18, -0.1f), QPoint(0, 48), QVector3D(4, 12, 4)), }; m_normalArms = { @@ -79,7 +79,7 @@ Scene::Scene(const QImage& skin, bool slim, const QImage& cape) : QOpenGLFunctio }; m_cape = new opengl::BoxGeometry(QVector3D(10, 16, 1), QVector3D(0, -8, 2.5), QPoint(0, 0), QVector3D(10, 16, 1), QSize(64, 32)); - m_cape->rotate(10.8, QVector3D(1, 0, 0)); + m_cape->rotate(10.8f, QVector3D(1, 0, 0)); m_cape->rotate(180, QVector3D(0, 1, 0)); auto leftWing = diff --git a/launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp b/launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp index 03f10be1e..52799a7b9 100644 --- a/launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp +++ b/launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp @@ -270,10 +270,10 @@ QColor calculateContrastingColor(const QColor& color) { auto luma = Rainbow::luma(color); if (luma < 0.5) { - constexpr float contrast = 0.05; + constexpr float contrast = 0.05f; return Rainbow::lighten(color, contrast); } else { - constexpr float contrast = 0.2; + constexpr float contrast = 0.2f; return Rainbow::darken(color, contrast); } } diff --git a/launcher/ui/instanceview/VisualGroup.cpp b/launcher/ui/instanceview/VisualGroup.cpp index 4f7a61eb5..b68c09171 100644 --- a/launcher/ui/instanceview/VisualGroup.cpp +++ b/launcher/ui/instanceview/VisualGroup.cpp @@ -151,7 +151,7 @@ void VisualGroup::drawHeader(QPainter* painter, const QStyleOptionViewItem& opti QPen pen; pen.setWidth(2); QColor penColor = option.palette.text().color(); - penColor.setAlphaF(0.6); + penColor.setAlphaF(0.6f); pen.setColor(penColor); painter->setPen(pen); painter->setRenderHint(QPainter::Antialiasing); @@ -194,7 +194,7 @@ void VisualGroup::drawHeader(QPainter* painter, const QStyleOptionViewItem& opti // BEGIN: horizontal line { - penColor.setAlphaF(0.05); + penColor.setAlphaF(0.05f); pen.setColor(penColor); painter->setPen(pen); // startPoint is left + arrow + text + space diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp index c1eed81bd..98aa650e0 100644 --- a/launcher/ui/pages/modplatform/ResourcePage.cpp +++ b/launcher/ui/pages/modplatform/ResourcePage.cpp @@ -557,9 +557,8 @@ void ResourcePage::openProject(QVariant projectID) [this, okBtn](int index) { okBtn->setEnabled(m_ui->versionSelectionBox->itemData(index).toInt() >= 0); }); auto jump = [this] { - for (int row = 0; row < m_model->rowCount({}); row++) { - const QModelIndex index = m_model->index(row); - m_ui->packView->setCurrentIndex(index); + if (m_model->rowCount({}) > 0) { + m_ui->packView->setCurrentIndex(m_model->index(0)); return; } m_ui->packDescription->setText(tr("The resource was not found")); diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp index 216625101..b208f5c74 100644 --- a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp +++ b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp @@ -146,13 +146,13 @@ void FtbPage::triggerSearch() m_filterModel->setSearchTerm(m_ui->searchEdit->text()); } -void FtbPage::onSortingSelectionChanged(QString data) +void FtbPage::onSortingSelectionChanged(QString selected) { - auto toSet = m_filterModel->getAvailableSortings().value(data); + auto toSet = m_filterModel->getAvailableSortings().value(selected); m_filterModel->setSorting(toSet); } -void FtbPage::onSelectionChanged(QModelIndex first, QModelIndex second) +void FtbPage::onSelectionChanged(QModelIndex first, QModelIndex /*second*/) { m_ui->versionSelectionBox->clear(); @@ -176,14 +176,14 @@ void FtbPage::onSelectionChanged(QModelIndex first, QModelIndex second) suggestCurrent(); } -void FtbPage::onVersionSelectionChanged(QString data) +void FtbPage::onVersionSelectionChanged(QString selected) { - if (data.isNull() || data.isEmpty()) { + if (selected.isNull() || selected.isEmpty()) { m_selectedVersion = ""; return; } - m_selectedVersion = data; + m_selectedVersion = selected; suggestCurrent(); } diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.h b/launcher/ui/pages/modplatform/ftb/FtbPage.h index d85053fab..84e7740d4 100644 --- a/launcher/ui/pages/modplatform/ftb/FtbPage.h +++ b/launcher/ui/pages/modplatform/ftb/FtbPage.h @@ -80,9 +80,9 @@ class FtbPage : public QWidget, public ModpackProviderBasePage { private slots: void triggerSearch(); - void onSortingSelectionChanged(QString data); + void onSortingSelectionChanged(QString selected); void onSelectionChanged(QModelIndex first, QModelIndex second); - void onVersionSelectionChanged(QString data); + void onVersionSelectionChanged(QString selected); private: Ui::FtbPage* m_ui = nullptr; diff --git a/launcher/ui/widgets/JavaWizardWidget.cpp b/launcher/ui/widgets/JavaWizardWidget.cpp index c247b7882..3192c22ec 100644 --- a/launcher/ui/widgets/JavaWizardWidget.cpp +++ b/launcher/ui/widgets/JavaWizardWidget.cpp @@ -261,9 +261,6 @@ JavaWizardWidget::ValidationStatus JavaWizardWidget::validate() default: return ValidationStatus::Bad; } - if (button == QMessageBox::No) { - return ValidationStatus::Bad; - } } return ValidationStatus::JavaBad; } break; diff --git a/launcher/updater/prismupdater/UpdaterDialogs.cpp b/launcher/updater/prismupdater/UpdaterDialogs.cpp index eab3e6bbb..31e1b10aa 100644 --- a/launcher/updater/prismupdater/UpdaterDialogs.cpp +++ b/launcher/updater/prismupdater/UpdaterDialogs.cpp @@ -95,7 +95,7 @@ GitHubRelease SelectReleaseDialog::getRelease(QTreeWidgetItem* item) return release; } -void SelectReleaseDialog::selectionChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous) +void SelectReleaseDialog::selectionChanged(QTreeWidgetItem* current, QTreeWidgetItem* /*previous*/) { GitHubRelease release = getRelease(current); QString body = markdownToHTML(release.body.toUtf8()); @@ -166,7 +166,7 @@ GitHubReleaseAsset SelectReleaseAssetDialog::getAsset(QTreeWidgetItem* item) return selected_asset; } -void SelectReleaseAssetDialog::selectionChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous) +void SelectReleaseAssetDialog::selectionChanged(QTreeWidgetItem* current, QTreeWidgetItem* /*previous*/) { GitHubReleaseAsset asset = getAsset(current); m_selectedAsset = asset;