diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index 3c700be60d..288a34dcca 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -439,7 +439,7 @@ error_code npDrmIsAvailable(vm::cptr k_licensee_addr, vm::cptr drm_pat if (Emu.GetCat() == "PE") { std::copy_n(NP_PSP_KEY_2, std::size(NP_PSP_KEY_2), k_licensee.begin()); - sceNp.success("npDrmIsAvailable(): PSP remaster KLicense key apllied."); + sceNp.success("npDrmIsAvailable(): PSP remaster KLicense key applied."); } const std::string enc_drm_path(drm_path.get_ptr(), std::find(drm_path.get_ptr(), drm_path.get_ptr() + 0x100, '\0')); diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp index 60f4102e0d..552dcd081c 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.cpp +++ b/rpcs3/Emu/Cell/PPUTranslator.cpp @@ -83,7 +83,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_mo switch (rel.type) { - // Ignore relative relocations, they are handled in emmitted code + // Ignore relative relocations, they are handled in emitted code // Comment out types we haven't confirmed as used and working case 10: case 11: diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp index 801fe137fd..c7d0b21530 100644 --- a/rpcs3/main.cpp +++ b/rpcs3/main.cpp @@ -311,7 +311,7 @@ int main(int argc, char** argv) { report_fatal_error("Cannot create RPCS3.log (access denied)." #ifdef _WIN32 - "\nNote that RPCS3 cannot be installed in Program Files or similar directory with limited permissions." + "\nNote that RPCS3 cannot be installed in Program Files or similar directories with limited permissions." #else "\nPlease, check RPCS3 permissions in '~/.config/rpcs3'." #endif diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 05c710746f..7161144137 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -129,13 +129,13 @@ void main_window::Init() // enable play options if a recent game exists const bool enable_play_last = !m_recent_game_acts.isEmpty() && m_recent_game_acts.first(); - const QString start_toolip = enable_play_last ? tr("Play %0").arg(m_recent_game_acts.first()->text()) : tr("Play"); + const QString start_tooltip = enable_play_last ? tr("Play %0").arg(m_recent_game_acts.first()->text()) : tr("Play"); if (enable_play_last) { ui->sysPauseAct->setText(tr("&Play last played game\tCtrl+E")); ui->sysPauseAct->setIcon(m_icon_play); - ui->toolbar_start->setToolTip(start_toolip); + ui->toolbar_start->setToolTip(start_tooltip); } ui->sysPauseAct->setEnabled(enable_play_last); @@ -147,7 +147,7 @@ void main_window::Init() m_thumb_bar->setWindow(windowHandle()); m_thumb_playPause = new QWinThumbnailToolButton(m_thumb_bar); - m_thumb_playPause->setToolTip(start_toolip); + m_thumb_playPause->setToolTip(start_tooltip); m_thumb_playPause->setIcon(m_icon_thumb_play); m_thumb_playPause->setEnabled(enable_play_last); @@ -677,11 +677,11 @@ void main_window::HandlePupInstallation(QString file_path) fs::file update_files_f = pup.get_file(0x300); tar_object update_files(update_files_f); - auto updatefilenames = update_files.get_filenames(); + auto update_filenames = update_files.get_filenames(); - updatefilenames.erase(std::remove_if( - updatefilenames.begin(), updatefilenames.end(), [](std::string s) { return s.find("dev_flash_") == umax; }), - updatefilenames.end()); + update_filenames.erase(std::remove_if( + update_filenames.begin(), update_filenames.end(), [](std::string s) { return s.find("dev_flash_") == umax; }), + update_filenames.end()); std::string version_string = pup.get_file(0x100).to_string(); @@ -699,7 +699,7 @@ void main_window::HandlePupInstallation(QString file_path) return; } - progress_dialog pdlg(tr("RPCS3 Firmware Installer"), tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)), tr("Cancel"), 0, static_cast(updatefilenames.size()), false, this); + progress_dialog pdlg(tr("RPCS3 Firmware Installer"), tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)), tr("Cancel"), 0, static_cast(update_filenames.size()), false, this); pdlg.show(); // Synchronization variable @@ -708,13 +708,13 @@ void main_window::HandlePupInstallation(QString file_path) // Run asynchronously named_thread worker("Firmware Installer", [&] { - for (const auto& updatefilename : updatefilenames) + for (const auto& update_filename : update_filenames) { if (progress == -1) break; - fs::file updatefile = update_files.get_file(updatefilename); + fs::file update_file = update_files.get_file(update_filename); - SCEDecrypter self_dec(updatefile); + SCEDecrypter self_dec(update_file); self_dec.LoadHeaders(); self_dec.LoadMetadata(SCEPKG_ERK, SCEPKG_RIV); self_dec.DecryptData(); @@ -832,7 +832,7 @@ void main_window::DecryptSPRXLibraries() gui_log.notice("Finished decrypting all binaries."); } -/** Needed so that when a backup occurs of window state in guisettings, the state is current. +/** Needed so that when a backup occurs of window state in gui_settings, the state is current. * Also, so that on close, the window state is preserved. */ void main_window::SaveWindowState() diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index df308abb9a..e6e33c9e02 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -233,7 +233,7 @@ - + @@ -651,7 +651,7 @@ Game List Refresh - + false diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.ui b/rpcs3/rpcs3qt/pad_settings_dialog.ui index 698a4892b2..9e08b1ca6f 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.ui +++ b/rpcs3/rpcs3qt/pad_settings_dialog.ui @@ -2324,7 +2324,6 @@ - diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 2db9b70178..5aa25d3469 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -408,15 +408,15 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std }); ui->disableVertexCache->setEnabled(!ui->multithreadedRSX->isChecked()); - m_emu_settings->EnhanceCheckBox(ui->scrictModeRendering, emu_settings_type::StrictRenderingMode); - SubscribeTooltip(ui->scrictModeRendering, tooltips.settings.strict_rendering_mode); + m_emu_settings->EnhanceCheckBox(ui->strictModeRendering, emu_settings_type::StrictRenderingMode); + SubscribeTooltip(ui->strictModeRendering, tooltips.settings.strict_rendering_mode); const auto onStrictRenderingMode = [this](bool checked) { ui->gb_resolutionScale->setEnabled(!checked); ui->gb_minimumScalableDimension->setEnabled(!checked); ui->gb_anisotropicFilter->setEnabled(!checked); }; - connect(ui->scrictModeRendering, &QCheckBox::clicked, this, onStrictRenderingMode); + connect(ui->strictModeRendering, &QCheckBox::clicked, this, onStrictRenderingMode); // Radio buttons @@ -617,7 +617,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std }; // Handle connects to disable specific checkboxes that depend on GUI state. - onStrictRenderingMode(ui->scrictModeRendering->isChecked()); + onStrictRenderingMode(ui->strictModeRendering->isChecked()); fix_gl_legacy(ui->renderBox->currentText()); // Init connect(ui->renderBox, &QComboBox::currentTextChanged, fix_gl_legacy); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index d7e59aeb0b..1319cd805d 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -702,7 +702,7 @@ - + Strict Rendering Mode @@ -2064,7 +2064,7 @@ - + diff --git a/rpcs3/rpcs3qt/welcome_dialog.ui b/rpcs3/rpcs3qt/welcome_dialog.ui index e3c100ecbf..e22cc0fa91 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.ui +++ b/rpcs3/rpcs3qt/welcome_dialog.ui @@ -282,9 +282,6 @@ - - -