From d05b996c8a729223c25216fb31a26c062646e9fe Mon Sep 17 00:00:00 2001 From: Trial97 Date: Sat, 17 Jan 2026 02:28:56 +0200 Subject: [PATCH] fix build also fixed some warninigs of unused vars and formated the code again Signed-off-by: Trial97 --- launcher/InstanceList.cpp | 4 +--- .../minecraft/VanillaInstanceCreationTask.cpp | 3 ++- launcher/minecraft/auth/AccountList.cpp | 6 ++++-- launcher/minecraft/launch/ExtractNatives.cpp | 1 - launcher/minecraft/skins/CapeChange.cpp | 2 +- launcher/modplatform/CheckUpdateTask.h | 6 +----- launcher/net/DummySink.h | 2 +- launcher/net/NetJob.cpp | 3 +-- launcher/ui/dialogs/InstallLoaderDialog.cpp | 6 +----- launcher/ui/dialogs/ProfileSelectDialog.cpp | 5 +++-- launcher/ui/dialogs/ResourceDownloadDialog.cpp | 16 ++++------------ launcher/ui/dialogs/ResourceDownloadDialog.h | 8 ++------ launcher/ui/pages/instance/DataPackPage.cpp | 3 --- .../ui/pages/instance/InstanceSettingsPage.h | 3 +-- launcher/ui/pages/instance/ModFolderPage.cpp | 7 ++----- launcher/ui/pages/instance/ResourcePackPage.cpp | 1 - launcher/ui/pages/instance/ShaderPackPage.cpp | 1 - launcher/ui/pages/instance/TexturePackPage.cpp | 1 - launcher/ui/pages/instance/WorldListPage.cpp | 4 +--- launcher/ui/pages/modplatform/ModPage.cpp | 4 +--- launcher/ui/pages/modplatform/ResourcePage.cpp | 4 +--- 21 files changed, 27 insertions(+), 63 deletions(-) diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp index ca5682ec5..68681a9bb 100644 --- a/launcher/InstanceList.cpp +++ b/launcher/InstanceList.cpp @@ -159,7 +159,7 @@ int InstanceList::rowCount(const QModelIndex& parent) const QModelIndex InstanceList::index(int row, int column, const QModelIndex& parent) const { Q_UNUSED(parent); - if (row < 0 || row >= m_instances.size()) + if (row < 0 || static_cast(row) >= m_instances.size()) return QModelIndex(); return createIndex(row, column, m_instances.at(row).get()); } @@ -508,7 +508,6 @@ InstanceList::InstListError InstanceList::loadList() for (auto& id : discoverInstances()) { if (existingIds.contains(id)) { - auto instPair = existingIds[id]; existingIds.remove(id); qInfo() << "Should keep and soft-reload" << id; } else { @@ -1035,7 +1034,6 @@ bool InstanceList::commitStagedInstance(const QString& path, groupName = QString(); QString instID; - BaseInstance* inst; auto should_override = commiting.shouldOverride(); diff --git a/launcher/minecraft/VanillaInstanceCreationTask.cpp b/launcher/minecraft/VanillaInstanceCreationTask.cpp index 7af377953..420ffd3c3 100644 --- a/launcher/minecraft/VanillaInstanceCreationTask.cpp +++ b/launcher/minecraft/VanillaInstanceCreationTask.cpp @@ -19,7 +19,8 @@ bool VanillaCreationTask::createInstance() { setStatus(tr("Creating instance from version %1").arg(m_version->name())); - MinecraftInstance inst(m_globalSettings, std::make_unique(FS::PathCombine(m_stagingPath, "instance.cfg")), m_stagingPath); + MinecraftInstance inst(m_globalSettings, std::make_unique(FS::PathCombine(m_stagingPath, "instance.cfg")), + m_stagingPath); SettingsObject::Lock lock(inst.settings()); auto components = inst.getPackProfile(); diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp index 22298744b..486dfc158 100644 --- a/launcher/minecraft/auth/AccountList.cpp +++ b/launcher/minecraft/auth/AccountList.cpp @@ -168,7 +168,8 @@ void AccountList::removeAccount(QModelIndex index) } } -void AccountList::moveAccount(QModelIndex index, int delta) { +void AccountList::moveAccount(QModelIndex index, int delta) +{ const int row = index.row(); const int newRow = row + delta; if (index.isValid() && row < m_accounts.size() && newRow >= 0 && newRow < m_accounts.size()) { @@ -181,7 +182,8 @@ void AccountList::moveAccount(QModelIndex index, int delta) { onListChanged(); } else { - qCritical().noquote() << "AccountList: failed to move account from" << row << "to" << newRow << QString("(%1 accounts in total)").arg(this->count()); + qCritical().noquote() << "AccountList: failed to move account from" << row << "to" << newRow + << QString("(%1 accounts in total)").arg(this->count()); } } } diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp index 3174e0e2a..a7d47f1a1 100644 --- a/launcher/minecraft/launch/ExtractNatives.cpp +++ b/launcher/minecraft/launch/ExtractNatives.cpp @@ -65,7 +65,6 @@ void ExtractNatives::executeTask() emitSucceeded(); return; } - auto settings = instance->settings(); auto outputPath = instance->getNativePath(); FS::ensureFolderPathExists(outputPath); diff --git a/launcher/minecraft/skins/CapeChange.cpp b/launcher/minecraft/skins/CapeChange.cpp index 2bb423994..c955a1622 100644 --- a/launcher/minecraft/skins/CapeChange.cpp +++ b/launcher/minecraft/skins/CapeChange.cpp @@ -36,8 +36,8 @@ #include "CapeChange.h" -#include #include +#include #include "net/RawHeaderProxy.h" CapeChange::CapeChange(QString cape) : NetRequest(), m_capeId(cape) diff --git a/launcher/modplatform/CheckUpdateTask.h b/launcher/modplatform/CheckUpdateTask.h index 57f6625a6..b9bed7ee1 100644 --- a/launcher/modplatform/CheckUpdateTask.h +++ b/launcher/modplatform/CheckUpdateTask.h @@ -15,11 +15,7 @@ class CheckUpdateTask : public Task { std::list& mcVersions, QList loadersList, ResourceFolderModel* resourceModel) - : Task() - , m_resources(resources) - , m_gameVersions(mcVersions) - , m_loadersList(std::move(loadersList)) - , m_resourceModel(resourceModel) + : Task(), m_resources(resources), m_gameVersions(mcVersions), m_loadersList(std::move(loadersList)), m_resourceModel(resourceModel) {} struct Update { diff --git a/launcher/net/DummySink.h b/launcher/net/DummySink.h index 03eb49732..fa540fd2d 100644 --- a/launcher/net/DummySink.h +++ b/launcher/net/DummySink.h @@ -31,4 +31,4 @@ class DummySink : public Sink { auto hasLocalData() -> bool override { return false; } }; -} // namespace Net +} // namespace Net diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp index 530349c28..444985431 100644 --- a/launcher/net/NetJob.cpp +++ b/launcher/net/NetJob.cpp @@ -44,8 +44,7 @@ #include "ui/dialogs/CustomMessageBox.h" #endif -NetJob::NetJob(QString job_name, QNetworkAccessManager* network, int max_concurrent) - : ConcurrentTask(job_name), m_network(network) +NetJob::NetJob(QString job_name, QNetworkAccessManager* network, int max_concurrent) : ConcurrentTask(job_name), m_network(network) { #if defined(LAUNCHER_APPLICATION) if (APPLICATION_DYN && max_concurrent < 0) diff --git a/launcher/ui/dialogs/InstallLoaderDialog.cpp b/launcher/ui/dialogs/InstallLoaderDialog.cpp index 820e65a63..44f6ae442 100644 --- a/launcher/ui/dialogs/InstallLoaderDialog.cpp +++ b/launcher/ui/dialogs/InstallLoaderDialog.cpp @@ -33,11 +33,7 @@ class InstallLoaderPage : public VersionSelectWidget, public BasePage { Q_OBJECT public: - InstallLoaderPage(const QString& id, - const QString& iconName, - const QString& name, - const Version& oldestVersion, - PackProfile* profile) + InstallLoaderPage(const QString& id, const QString& iconName, const QString& name, const Version& oldestVersion, PackProfile* profile) : VersionSelectWidget(nullptr), uid(id), iconName(iconName), name(name) { const QString minecraftVersion = profile->getComponentVersion("net.minecraft"); diff --git a/launcher/ui/dialogs/ProfileSelectDialog.cpp b/launcher/ui/dialogs/ProfileSelectDialog.cpp index d3168d0e3..4c4995fea 100644 --- a/launcher/ui/dialogs/ProfileSelectDialog.cpp +++ b/launcher/ui/dialogs/ProfileSelectDialog.cpp @@ -28,7 +28,8 @@ class HideCheckboxProxyModel : public QIdentityProxyModel { public: using QIdentityProxyModel::QIdentityProxyModel; - QVariant data(const QModelIndex& index, int role) const override { + QVariant data(const QModelIndex& index, int role) const override + { if (role == Qt::CheckStateRole) { return {}; } @@ -45,7 +46,7 @@ ProfileSelectDialog::ProfileSelectDialog(const QString& message, int flags, QWid m_accounts = APPLICATION->accounts(); auto proxy = new HideCheckboxProxyModel(ui->view); - proxy->setSourceModel(m_accounts.get()); + proxy->setSourceModel(m_accounts); ui->view->setModel(proxy); // Set the message label. diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp index 439cb5391..5695d160e 100644 --- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp +++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp @@ -310,9 +310,7 @@ GetModDependenciesTask::Ptr ModDownloadDialog::getModDependenciesTask() return nullptr; } -ResourcePackDownloadDialog::ResourcePackDownloadDialog(QWidget* parent, - ResourcePackFolderModel* resource_packs, - BaseInstance* instance) +ResourcePackDownloadDialog::ResourcePackDownloadDialog(QWidget* parent, ResourcePackFolderModel* resource_packs, BaseInstance* instance) : ResourceDownloadDialog(parent, resource_packs), m_instance(instance) { setWindowTitle(dialogTitle()); @@ -335,9 +333,7 @@ QList ResourcePackDownloadDialog::getPages() return pages; } -TexturePackDownloadDialog::TexturePackDownloadDialog(QWidget* parent, - TexturePackFolderModel* resource_packs, - BaseInstance* instance) +TexturePackDownloadDialog::TexturePackDownloadDialog(QWidget* parent, TexturePackFolderModel* resource_packs, BaseInstance* instance) : ResourceDownloadDialog(parent, resource_packs), m_instance(instance) { setWindowTitle(dialogTitle()); @@ -360,9 +356,7 @@ QList TexturePackDownloadDialog::getPages() return pages; } -ShaderPackDownloadDialog::ShaderPackDownloadDialog(QWidget* parent, - ShaderPackFolderModel* shaders, - BaseInstance* instance) +ShaderPackDownloadDialog::ShaderPackDownloadDialog(QWidget* parent, ShaderPackFolderModel* shaders, BaseInstance* instance) : ResourceDownloadDialog(parent, shaders), m_instance(instance) { setWindowTitle(dialogTitle()); @@ -400,9 +394,7 @@ void ResourceDownloadDialog::setResourceMetadata(const std::shared_ptropenProject(meta->project_id); } -DataPackDownloadDialog::DataPackDownloadDialog(QWidget* parent, - DataPackFolderModel* data_packs, - BaseInstance* instance) +DataPackDownloadDialog::DataPackDownloadDialog(QWidget* parent, DataPackFolderModel* data_packs, BaseInstance* instance) : ResourceDownloadDialog(parent, data_packs), m_instance(instance) { setWindowTitle(dialogTitle()); diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.h b/launcher/ui/dialogs/ResourceDownloadDialog.h index 3597d4f31..a85a85a09 100644 --- a/launcher/ui/dialogs/ResourceDownloadDialog.h +++ b/launcher/ui/dialogs/ResourceDownloadDialog.h @@ -118,9 +118,7 @@ class ResourcePackDownloadDialog final : public ResourceDownloadDialog { Q_OBJECT public: - explicit ResourcePackDownloadDialog(QWidget* parent, - ResourcePackFolderModel* resource_packs, - BaseInstance* instance); + explicit ResourcePackDownloadDialog(QWidget* parent, ResourcePackFolderModel* resource_packs, BaseInstance* instance); ~ResourcePackDownloadDialog() override = default; //: String that gets appended to the resource pack download dialog title ("Download " + resourcesString()) @@ -137,9 +135,7 @@ class TexturePackDownloadDialog final : public ResourceDownloadDialog { Q_OBJECT public: - explicit TexturePackDownloadDialog(QWidget* parent, - TexturePackFolderModel* resource_packs, - BaseInstance* instance); + explicit TexturePackDownloadDialog(QWidget* parent, TexturePackFolderModel* resource_packs, BaseInstance* instance); ~TexturePackDownloadDialog() override = default; //: String that gets appended to the texture pack download dialog title ("Download " + resourcesString()) diff --git a/launcher/ui/pages/instance/DataPackPage.cpp b/launcher/ui/pages/instance/DataPackPage.cpp index 71d421850..fb07a768b 100644 --- a/launcher/ui/pages/instance/DataPackPage.cpp +++ b/launcher/ui/pages/instance/DataPackPage.cpp @@ -67,8 +67,6 @@ void DataPackPage::downloadDataPacks() if (m_instance->typeName() != "Minecraft") return; // this is a null instance or a legacy instance - auto profile = static_cast(m_instance)->getPackProfile(); - m_downloadDialog = new ResourceDownload::DataPackDownloadDialog(this, m_model, m_instance); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close); connect(m_downloadDialog, &QDialog::finished, this, &DataPackPage::downloadDialogFinished); @@ -119,7 +117,6 @@ void DataPackPage::updateDataPacks() if (m_instance->typeName() != "Minecraft") return; // this is a null instance or a legacy instance - auto profile = static_cast(m_instance)->getPackProfile(); if (APPLICATION->settings()->get("ModMetadataDisabled").toBool()) { QMessageBox::critical(this, tr("Error"), tr("Data pack updates are unavailable when metadata is disabled!")); return; diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h index d41bad2d4..79d5944eb 100644 --- a/launcher/ui/pages/instance/InstanceSettingsPage.h +++ b/launcher/ui/pages/instance/InstanceSettingsPage.h @@ -44,8 +44,7 @@ class InstanceSettingsPage : public MinecraftSettingsWidget, public BasePage { Q_OBJECT public: - explicit InstanceSettingsPage(MinecraftInstance* instance, QWidget* parent = nullptr) - : MinecraftSettingsWidget(instance, parent) + explicit InstanceSettingsPage(MinecraftInstance* instance, QWidget* parent = nullptr) : MinecraftSettingsWidget(instance, parent) { connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::saveSettings); connect(APPLICATION, &Application::globalSettingsApplied, this, &InstanceSettingsPage::loadSettings); diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp index ea3a8141e..c39c5ed9d 100644 --- a/launcher/ui/pages/instance/ModFolderPage.cpp +++ b/launcher/ui/pages/instance/ModFolderPage.cpp @@ -341,8 +341,7 @@ void ModFolderPage::exportModMetadata() dlg.exec(); } -CoreModFolderPage::CoreModFolderPage(BaseInstance* inst, ModFolderModel* mods, QWidget* parent) - : ModFolderPage(inst, mods, parent) +CoreModFolderPage::CoreModFolderPage(BaseInstance* inst, ModFolderModel* mods, QWidget* parent) : ModFolderPage(inst, mods, parent) { auto mcInst = dynamic_cast(m_instance); if (mcInst) { @@ -381,9 +380,7 @@ bool CoreModFolderPage::shouldDisplay() const return false; } -NilModFolderPage::NilModFolderPage(BaseInstance* inst, ModFolderModel* mods, QWidget* parent) - : ModFolderPage(inst, mods, parent) -{} +NilModFolderPage::NilModFolderPage(BaseInstance* inst, ModFolderModel* mods, QWidget* parent) : ModFolderPage(inst, mods, parent) {} bool NilModFolderPage::shouldDisplay() const { diff --git a/launcher/ui/pages/instance/ResourcePackPage.cpp b/launcher/ui/pages/instance/ResourcePackPage.cpp index 203253711..eb085e29b 100644 --- a/launcher/ui/pages/instance/ResourcePackPage.cpp +++ b/launcher/ui/pages/instance/ResourcePackPage.cpp @@ -134,7 +134,6 @@ void ResourcePackPage::updateResourcePacks() if (m_instance->typeName() != "Minecraft") return; // this is a null instance or a legacy instance - auto profile = static_cast(m_instance)->getPackProfile(); if (APPLICATION->settings()->get("ModMetadataDisabled").toBool()) { QMessageBox::critical(this, tr("Error"), tr("Resource pack updates are unavailable when metadata is disabled!")); return; diff --git a/launcher/ui/pages/instance/ShaderPackPage.cpp b/launcher/ui/pages/instance/ShaderPackPage.cpp index c6c0ccbc3..3120d9013 100644 --- a/launcher/ui/pages/instance/ShaderPackPage.cpp +++ b/launcher/ui/pages/instance/ShaderPackPage.cpp @@ -131,7 +131,6 @@ void ShaderPackPage::updateShaderPacks() if (m_instance->typeName() != "Minecraft") return; // this is a null instance or a legacy instance - auto profile = static_cast(m_instance)->getPackProfile(); if (APPLICATION->settings()->get("ModMetadataDisabled").toBool()) { QMessageBox::critical(this, tr("Error"), tr("Shader pack updates are unavailable when metadata is disabled!")); return; diff --git a/launcher/ui/pages/instance/TexturePackPage.cpp b/launcher/ui/pages/instance/TexturePackPage.cpp index c95e17b86..ec0486fe4 100644 --- a/launcher/ui/pages/instance/TexturePackPage.cpp +++ b/launcher/ui/pages/instance/TexturePackPage.cpp @@ -139,7 +139,6 @@ void TexturePackPage::updateTexturePacks() if (m_instance->typeName() != "Minecraft") return; // this is a null instance or a legacy instance - auto profile = static_cast(m_instance)->getPackProfile(); if (APPLICATION->settings()->get("ModMetadataDisabled").toBool()) { QMessageBox::critical(this, tr("Error"), tr("Texture pack updates are unavailable when metadata is disabled!")); return; diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp index 1b6b082d3..ecb48accb 100644 --- a/launcher/ui/pages/instance/WorldListPage.cpp +++ b/launcher/ui/pages/instance/WorldListPage.cpp @@ -239,9 +239,7 @@ void WorldListPage::on_actionData_Packs_triggered() bool isIndexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool(); m_datapackModel.reset(new DataPackFolderModel(folder, m_inst, isIndexed, true)); - provider.addPageCreator([this] { - return new DataPackPage(m_inst, m_datapackModel.get(), this); - }); + provider.addPageCreator([this] { return new DataPackPage(m_inst, m_datapackModel.get(), this); }); auto layout = new QVBoxLayout(dialog); diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp index 005aee749..706d35378 100644 --- a/launcher/ui/pages/modplatform/ModPage.cpp +++ b/launcher/ui/pages/modplatform/ModPage.cpp @@ -112,9 +112,7 @@ QMap ModPage::urlHandlers() const /******** Make changes to the UI ********/ -void ModPage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack, - ModPlatform::IndexedVersion& version, - ResourceFolderModel* base_model) +void ModPage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack, ModPlatform::IndexedVersion& version, ResourceFolderModel* base_model) { bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool(); m_model->addPack(pack, version, base_model, is_indexed); diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp index c1d147e5e..fc7385937 100644 --- a/launcher/ui/pages/modplatform/ResourcePage.cpp +++ b/launcher/ui/pages/modplatform/ResourcePage.cpp @@ -370,9 +370,7 @@ void ResourcePage::removeResourceFromDialog(const QString& pack_name) m_parentDialog->removeResource(pack_name); } -void ResourcePage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack, - ModPlatform::IndexedVersion& ver, - ResourceFolderModel* base_model) +void ResourcePage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack, ModPlatform::IndexedVersion& ver, ResourceFolderModel* base_model) { bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool(); m_model->addPack(pack, ver, base_model, is_indexed);