diff options
author | David <25727384+ogniK5377@users.noreply.github.com> | 2020-08-03 12:58:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-03 12:58:00 +0200 |
commit | 50d82648330cb4a19a490d7e85af807ae682c3fa (patch) | |
tree | e09ec804eeb24f2393a0500d733bdfa7470ca814 | |
parent | Merge pull request #4392 from lioncash/guard (diff) | |
parent | yuzu/main: Remove redundant usages of QStringLiteral("") (diff) | |
download | yuzu-50d82648330cb4a19a490d7e85af807ae682c3fa.tar yuzu-50d82648330cb4a19a490d7e85af807ae682c3fa.tar.gz yuzu-50d82648330cb4a19a490d7e85af807ae682c3fa.tar.bz2 yuzu-50d82648330cb4a19a490d7e85af807ae682c3fa.tar.lz yuzu-50d82648330cb4a19a490d7e85af807ae682c3fa.tar.xz yuzu-50d82648330cb4a19a490d7e85af807ae682c3fa.tar.zst yuzu-50d82648330cb4a19a490d7e85af807ae682c3fa.zip |
-rw-r--r-- | src/yuzu/main.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 276658c9e..2ff559746 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1823,7 +1823,7 @@ void GMainWindow::OnMenuInstallToNAND() { ui.action_Install_File_NAND->setEnabled(false); - install_progress = new QProgressDialog(QStringLiteral(""), tr("Cancel"), 0, total_size, this); + install_progress = new QProgressDialog(QString{}, tr("Cancel"), 0, total_size, this); install_progress->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint & ~Qt::WindowMaximizeButtonHint); install_progress->setAttribute(Qt::WA_DeleteOnClose, true); @@ -1873,12 +1873,12 @@ void GMainWindow::OnMenuInstallToNAND() { install_progress->close(); const QString install_results = - (new_files.isEmpty() ? QStringLiteral("") + (new_files.isEmpty() ? QString{} : tr("%n file(s) were newly installed\n", "", new_files.size())) + (overwritten_files.isEmpty() - ? QStringLiteral("") + ? QString{} : tr("%n file(s) were overwritten\n", "", overwritten_files.size())) + - (failed_files.isEmpty() ? QStringLiteral("") + (failed_files.isEmpty() ? QString{} : tr("%n file(s) failed to install\n", "", failed_files.size())); QMessageBox::information(this, tr("Install Results"), install_results); @@ -2370,8 +2370,7 @@ void GMainWindow::UpdateStatusBar() { if (shaders_building != 0) { shader_building_label->setText( - tr("Building: %1 shader").arg(shaders_building) + - (shaders_building != 1 ? QString::fromStdString("s") : QString::fromStdString(""))); + tr("Building: %n shader(s)", "", static_cast<int>(shaders_building))); shader_building_label->setVisible(true); } else { shader_building_label->setVisible(false); |