franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4438 from lioncash/localizing 

yuzu/main: Remove redundant usages of QStringLiteral("")
This commit is contained in:
David 2020-08-03 20:58:00 +10:00 committed by GitHub
parent 0c262f8ac2 2e303095d5
commit 50d8264833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/yuzu/main.cpp
View File

@ -1823,7 +1823,7 @@ void GMainWindow::OnMenuInstallToNAND() {
ui.action_Install_File_NAND->setEnabled(false); 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 & install_progress->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint &
~Qt::WindowMaximizeButtonHint); ~Qt::WindowMaximizeButtonHint);
install_progress->setAttribute(Qt::WA_DeleteOnClose, true); install_progress->setAttribute(Qt::WA_DeleteOnClose, true);
@ -1873,12 +1873,12 @@ void GMainWindow::OnMenuInstallToNAND() {
install_progress->close(); install_progress->close();
const QString install_results = const QString install_results =
(new_files.isEmpty() ? QStringLiteral("") (new_files.isEmpty() ? QString{}
: tr("%n file(s) were newly installed\n", "", new_files.size())) + : tr("%n file(s) were newly installed\n", "", new_files.size())) +
(overwritten_files.isEmpty() (overwritten_files.isEmpty()
? QStringLiteral("") ? QString{}
: tr("%n file(s) were overwritten\n", "", overwritten_files.size())) + : 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())); : tr("%n file(s) failed to install\n", "", failed_files.size()));
QMessageBox::information(this, tr("Install Results"), install_results); QMessageBox::information(this, tr("Install Results"), install_results);
@ -2370,8 +2370,7 @@ void GMainWindow::UpdateStatusBar() {
if (shaders_building != 0) { if (shaders_building != 0) {
shader_building_label->setText( shader_building_label->setText(
tr("Building: %1 shader").arg(shaders_building) + tr("Building: %n shader(s)", "", static_cast<int>(shaders_building)));
(shaders_building != 1 ? QString::fromStdString("s") : QString::fromStdString("")));
shader_building_label->setVisible(true); shader_building_label->setVisible(true);
} else { } else {
shader_building_label->setVisible(false); shader_building_label->setVisible(false);