diff --git a/src/core/importer.cpp b/src/core/importer.cpp index 85c9451..0f84283 100644 --- a/src/core/importer.cpp +++ b/src/core/importer.cpp @@ -117,11 +117,11 @@ void SDMCImporter::LoadSystemLanguage() { return; } - ConfigSavegame config; - if (!config.Init(std::move(data))) { + ConfigSavegame config_savegame; + if (!config_savegame.Init(std::move(data))) { return; } - system_language = static_cast(config.GetSystemLanguage()); + system_language = static_cast(config_savegame.GetSystemLanguage()); break; } } @@ -352,7 +352,7 @@ static const std::regex title_regex{"[0-9a-f]{8}"}; static std::string FindTMD(const std::string& path) { std::string title_metadata; - const bool ret = FileUtil::ForeachDirectoryEntry( + FileUtil::ForeachDirectoryEntry( nullptr, path, [&title_metadata](u64* /*num_entries_out*/, const std::string& directory, const std::string& virtual_name) { diff --git a/src/core/sdmc_decryptor.cpp b/src/core/sdmc_decryptor.cpp index 208fd1c..fbcb75a 100644 --- a/src/core/sdmc_decryptor.cpp +++ b/src/core/sdmc_decryptor.cpp @@ -121,7 +121,8 @@ std::size_t SDMCFile::Read(char* data, std::size_t length) { return length_read; } -std::size_t SDMCFile::Write(const char* data, std::size_t length) { +std::size_t SDMCFile::Write([[maybe_unused]] const char* data, + [[maybe_unused]] std::size_t length) { UNREACHABLE_MSG("Cannot write to a SDMCFile"); } diff --git a/src/frontend/helpers/dpi_aware_dialog.cpp b/src/frontend/helpers/dpi_aware_dialog.cpp index e1d5f39..afa7f8f 100644 --- a/src/frontend/helpers/dpi_aware_dialog.cpp +++ b/src/frontend/helpers/dpi_aware_dialog.cpp @@ -51,8 +51,8 @@ void DPIAwareDialog::OnScreenChanged() { const double scaleX = window_handle->screen()->logicalDotsPerInchX() / 96.0; const double scaleY = window_handle->screen()->logicalDotsPerInchY() / 96.0; if (resized) { - const int new_width = static_cast(scaleX * width() / previous_scaleX); - const int new_height = static_cast(scaleY * height() / previous_scaleY); + const int new_width = static_cast(scaleX * width() / prev_scaleX); + const int new_height = static_cast(scaleY * height() / prev_scaleY); setMinimumSize(0, 0); // Enforce this resize resize(new_width, new_height); } else { @@ -63,10 +63,10 @@ void DPIAwareDialog::OnScreenChanged() { resized = false; // This resize isn't user-initiated } - SetContentSizes(previous_width, previous_height); - previous_scaleX = scaleX; - previous_scaleY = scaleY; - previous_width = width(); - previous_height = height(); + SetContentSizes(prev_width, prev_height); + prev_scaleX = scaleX; + prev_scaleY = scaleY; + prev_width = width(); + prev_height = height(); } #endif diff --git a/src/frontend/helpers/dpi_aware_dialog.h b/src/frontend/helpers/dpi_aware_dialog.h index 4a0ed0c..fe6d5fd 100644 --- a/src/frontend/helpers/dpi_aware_dialog.h +++ b/src/frontend/helpers/dpi_aware_dialog.h @@ -16,7 +16,8 @@ protected: // Called with two zeroes to set up content sizes that are relative to dialog size. Also called // when screen is changed, to update those sizes. - virtual void SetContentSizes(int previous_width = 0, int previous_height = 0){}; + virtual void SetContentSizes([[maybe_unused]] int previous_width = 0, + [[maybe_unused]] int previous_height = 0){}; private: QWindow* window_handle{}; @@ -31,9 +32,9 @@ private: void OnScreenChanged(); bool resized = false; // whether this dialog has been manually resized - double previous_scaleX{}; - double previous_scaleY{}; - int previous_width{}; - int previous_height{}; + double prev_scaleX{}; + double prev_scaleY{}; + int prev_width{}; + int prev_height{}; #endif }; diff --git a/src/frontend/import_dialog.cpp b/src/frontend/import_dialog.cpp index e1bc56a..6868a4a 100644 --- a/src/frontend/import_dialog.cpp +++ b/src/frontend/import_dialog.cpp @@ -184,7 +184,7 @@ ImportDialog::ImportDialog(QWidget* parent, const Core::Config& config_) ImportDialog::~ImportDialog() = default; -void ImportDialog::SetContentSizes(int previous_width, int previous_height) { +void ImportDialog::SetContentSizes(int previous_width, [[maybe_unused]] int previous_height) { const int current_width = width(); if (previous_width == 0) { // first time ui->main->setColumnWidth(0, current_width * 0.66); @@ -345,7 +345,7 @@ void ImportDialog::InsertSecondLevelItem(std::size_t row, const Core::ContentSpe item->setCheckState(0, Qt::Unchecked); } - ui->main->invisibleRootItem()->child(row)->addChild(item); + ui->main->invisibleRootItem()->child(static_cast(row))->addChild(item); } void ImportDialog::OnItemChanged(QTreeWidgetItem* item, int column) { diff --git a/src/frontend/main.cpp b/src/frontend/main.cpp index eb3ef4e..2e3e0b1 100644 --- a/src/frontend/main.cpp +++ b/src/frontend/main.cpp @@ -94,7 +94,7 @@ MainDialog::MainDialog(QWidget* parent) MainDialog::~MainDialog() = default; -void MainDialog::SetContentSizes(int previous_width, int previous_height) { +void MainDialog::SetContentSizes(int previous_width, [[maybe_unused]] int previous_height) { const int current_width = width(); if (previous_width == 0) { // first time ui->main->setColumnWidth(0, 0.3 * current_width); diff --git a/src/frontend/select_nand_dialog.cpp b/src/frontend/select_nand_dialog.cpp index a619441..2bffce1 100644 --- a/src/frontend/select_nand_dialog.cpp +++ b/src/frontend/select_nand_dialog.cpp @@ -33,7 +33,7 @@ SelectNandDialog::SelectNandDialog(QWidget* parent, } connect(button, &QRadioButton::toggled, this, [this, i](bool checked) { if (checked) { - result = i; + result = static_cast(i); } }); ui->contentLayout->addWidget(button);