aiden
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Qt: Use variadic arg() instead of chaining multiple invocations

Browse Source 
More efficient.
pull/3789/head
Davide Pesavento 1 month ago committed by Connor McLaughlin
parent 614faf7d35
commit 04187ba0c5
11 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
src/duckstation-qt/aboutdialog.cpp
Unescape Escape View File

@ -33,7 +33,7 @@ AboutDialog::AboutDialog(QWidget* parent /* = nullptr */) : QDialog(parent)
m_ui.title->setFont(title_font);
m_ui.scmversion->setText(
tr("%1 (%2)").arg(QLatin1StringView(g_scm_tag_str)).arg(QLatin1StringView(g_scm_branch_str)));
tr("%1 (%2)").arg(QLatin1StringView(g_scm_tag_str), QLatin1StringView(g_scm_branch_str)));
m_ui.description->setText(QStringLiteral(R"(
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">

2
src/duckstation-qt/autoupdaterdialog.cpp
Unescape Escape View File

@ -536,7 +536,7 @@ void AutoUpdaterDialog::getChangesComplete(s32 status_code, Error& error, std::v
if (!message.isEmpty())
{
changes_html +=
QStringLiteral("<li>%1 <i>(%2)</i></li>").arg(message.toHtmlEscaped()).arg(author.toHtmlEscaped());
QStringLiteral("<li>%1 <i>(%2)</i></li>").arg(message.toHtmlEscaped(), author.toHtmlEscaped());
}
if (message.contains("[SAVEVERSION+]"_L1))

8
src/duckstation-qt/capturesettingswidget.cpp
Unescape Escape View File

@ -205,13 +205,13 @@ void CaptureSettingsWidget::onMediaCaptureBackendChanged()
for (const auto& [name, display_name] : MediaCapture::GetAudioContainerList(backend))
{
const QString qname = QString::fromStdString(name);
m_ui.audioCaptureContainer->addItem(tr("%1 (%2)").arg(QString::fromStdString(display_name)).arg(qname), qname);
m_ui.audioCaptureContainer->addItem(tr("%1 (%2)").arg(QString::fromStdString(display_name), qname), qname);
}
for (const auto& [name, display_name] : MediaCapture::GetVideoContainerList(backend))
{
const QString qname = QString::fromStdString(name);
m_ui.videoCaptureContainer->addItem(tr("%1 (%2)").arg(QString::fromStdString(display_name)).arg(qname), qname);
m_ui.videoCaptureContainer->addItem(tr("%1 (%2)").arg(QString::fromStdString(display_name), qname), qname);
}
SettingWidgetBinder::BindWidgetToStringSetting(sif, m_ui.audioCaptureContainer, "MediaCapture", "AudioContainer",
@ -249,7 +249,7 @@ void CaptureSettingsWidget::onMediaCaptureVideoContainerChanged()
for (const auto& [name, display_name] : MediaCapture::GetVideoCodecList(backend, container.c_str()))
{
const QString qname = QString::fromStdString(name);
m_ui.videoCaptureCodec->addItem(tr("%1 (%2)").arg(QString::fromStdString(display_name)).arg(qname), qname);
m_ui.videoCaptureCodec->addItem(tr("%1 (%2)").arg(QString::fromStdString(display_name), qname), qname);
}
if (const QString current_value =
@ -298,7 +298,7 @@ void CaptureSettingsWidget::onMediaCaptureAudioContainerChanged()
for (const auto& [name, display_name] : MediaCapture::GetAudioCodecList(backend, container.c_str()))
{
const QString qname = QString::fromStdString(name);
m_ui.audioCaptureCodec->addItem(tr("%1 (%2)").arg(QString::fromStdString(display_name)).arg(qname), qname);
m_ui.audioCaptureCodec->addItem(tr("%1 (%2)").arg(QString::fromStdString(display_name), qname), qname);
}
if (const QString current_value =

2
src/duckstation-qt/controllerbindingwidgets.cpp
Unescape Escape View File

@ -282,7 +282,7 @@ void ControllerBindingWidget::onAutomaticBindingClicked()
{
// we set it as data, because the device list could get invalidated while the menu is up
menu->addAction(InputDeviceListModel::getIconForKey(dev.key),
QStringLiteral("%1 (%2)").arg(dev.identifier).arg(dev.display_name),
QStringLiteral("%1 (%2)").arg(dev.identifier, dev.display_name),
[this, device = dev.identifier]() { doDeviceAutomaticBinding(device); });
added = true;
}

2
src/duckstation-qt/inputbindingwidgets.cpp
Unescape Escape View File

@ -120,7 +120,7 @@ void InputBindingWidget::updateTextAndToolTip()
{
m_full_text.clear();
setText(QString());
setToolTip(QStringLiteral("%1:\n\n%2\n\n%3").arg(m_display_name).arg(tr("No binding set.")).arg(tr(help_text)));
setToolTip(QStringLiteral("%1:\n\n%2\n\n%3").arg(m_display_name, tr("No binding set."), tr(help_text)));
}
else
{

2
src/duckstation-qt/interfacesettingswidget.cpp
Unescape Escape View File

@ -130,7 +130,7 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget
AutoUpdaterDialog::getDefaultTag());
connect(m_ui.checkForUpdates, &QPushButton::clicked, this, &InterfaceSettingsWidget::checkForUpdates);
m_ui.autoUpdateCurrentVersion->setText(tr("%1 (%2)").arg(g_scm_version_str).arg(g_scm_date_str));
m_ui.autoUpdateCurrentVersion->setText(tr("%1 (%2)").arg(g_scm_version_str, g_scm_date_str));
}
else
{

4
src/duckstation-qt/isobrowserwindow.cpp
Unescape Escape View File

@ -58,7 +58,7 @@ ISOBrowserWindow* ISOBrowserWindow::createAndOpenFile(QWidget* parent, const QSt
{
QtUtils::AsyncMessageBox(
parent, QMessageBox::Critical, u"Error"_s,
QStringLiteral("Failed to open %1:\n%2").arg(path).arg(QString::fromStdString(error.GetDescription())));
QStringLiteral("Failed to open %1:\n%2").arg(path, QString::fromStdString(error.GetDescription())));
delete ib;
return nullptr;
}
@ -100,7 +100,7 @@ void ISOBrowserWindow::onOpenFileClicked()
{
QtUtils::AsyncMessageBox(
this, QMessageBox::Critical, u"Error"_s,
QStringLiteral("Failed to open %1:\n%2").arg(path).arg(QString::fromStdString(error.GetDescription())));
QStringLiteral("Failed to open %1:\n%2").arg(path, QString::fromStdString(error.GetDescription())));
return;
}
}

8
src/duckstation-qt/mainwindow.cpp
Unescape Escape View File

@ -734,7 +734,7 @@ void MainWindow::openSelectDiscDialog(const QString& title, std::function<void(s
QStringList input_options;
for (const auto& [path, name] : devices)
input_options.append(tr("%1 (%2)").arg(QString::fromStdString(name)).arg(QString::fromStdString(path)));
input_options.append(tr("%1 (%2)").arg(QString::fromStdString(name), QString::fromStdString(path)));
QInputDialog* input_dialog = new QInputDialog(this);
input_dialog->setWindowTitle(title);
@ -1850,7 +1850,7 @@ void MainWindow::setGameListEntryCoverImage(const GameList::Entry* entry)
if (!QFile::copy(filename, new_filename))
{
QtUtils::AsyncMessageBox(this, QMessageBox::Critical, tr("Copy Error"),
tr("Failed to copy '%1' to '%2'").arg(filename).arg(new_filename));
tr("Failed to copy '%1' to '%2'").arg(filename, new_filename));
return;
}
if (!old_filename.isEmpty() && old_filename != new_filename && !QFile::remove(old_filename))
@ -3490,7 +3490,7 @@ void MainWindow::onToolsStartMediaCaptureTriggered(bool audio, bool video)
for (const auto& [container_name, container_desc] : containers)
{
const QString this_filter =
tr("%1 Files (*.%2)").arg(QString::fromStdString(container_desc)).arg(QString::fromStdString(container_name));
tr("%1 Files (*.%2)").arg(QString::fromStdString(container_desc), QString::fromStdString(container_name));
if (container_name == container)
selected_filter = this_filter;
@ -3579,7 +3579,7 @@ void MainWindow::onToolsOpenTextureDirectoryTriggered()
{
QString dir = QString::fromStdString(EmuFolders::Textures);
if (s_locals.system_valid && !s_locals.current_game_serial.isEmpty())
dir = QStringLiteral("%1" FS_OSPATH_SEPARATOR_STR "%2").arg(dir).arg(s_locals.current_game_serial);
dir = QStringLiteral("%1" FS_OSPATH_SEPARATOR_STR "%2").arg(dir, s_locals.current_game_serial);
QtUtils::OpenURL(this, QUrl::fromLocalFile(dir));
}

4
src/duckstation-qt/postprocessingsettingswidget.cpp
Unescape Escape View File

@ -460,7 +460,7 @@ void PostProcessingShaderConfigWidget::createUi()
{
static constexpr std::array<const char*, PostProcessing::ShaderOption::MAX_VECTOR_COMPONENTS + 1> suffixes = {
{QT_TR_NOOP("Red"), QT_TR_NOOP("Green"), QT_TR_NOOP("Blue"), QT_TR_NOOP("Alpha")}};
label = tr("%1 (%2)").arg(QString::fromStdString(option.ui_name)).arg(tr(suffixes[i]));
label = tr("%1 (%2)").arg(QString::fromStdString(option.ui_name), tr(suffixes[i]));
}
QWidget* label_w = new QLabel(label, this);
@ -848,7 +848,7 @@ void PostProcessingSelectShaderDialog::collapseShaderList(QTreeWidgetItem* item)
if (child->childCount() == 1)
{
QTreeWidgetItem* const grandchild = child->child(0);
const QString merged_name = QStringLiteral("%1/%2").arg(child->text(0)).arg(grandchild->text(0));
const QString merged_name = QStringLiteral("%1/%2").arg(child->text(0), grandchild->text(0));
grandchild->setText(0, merged_name);
child->removeChild(grandchild);
item->insertChild(i, grandchild);

20
src/duckstation-qt/qthost.cpp
Unescape Escape View File

@ -1849,7 +1849,7 @@ void CoreThread::dumpRAM(const QString& path)
{
emit errorReported(
QStringLiteral("Error"),
QStringLiteral("Failed to dump RAM to %1: %2").arg(path).arg(QString::fromStdString(error.GetDescription())));
QStringLiteral("Failed to dump RAM to %1: %2").arg(path, QString::fromStdString(error.GetDescription())));
}
}
@ -1871,7 +1871,7 @@ void CoreThread::dumpVRAM(const QString& path)
{
emit errorReported(
QStringLiteral("Error"),
QStringLiteral("Failed to dump VRAM to %1: %2").arg(path).arg(QString::fromStdString(error.GetDescription())));
QStringLiteral("Failed to dump VRAM to %1: %2").arg(path, QString::fromStdString(error.GetDescription())));
}
}
@ -1893,7 +1893,7 @@ void CoreThread::dumpSPURAM(const QString& path)
{
emit errorReported(
QStringLiteral("Error"),
QStringLiteral("Failed to dump SPU RAM to %1: %2").arg(path).arg(QString::fromStdString(error.GetDescription())));
QStringLiteral("Failed to dump SPU RAM to %1: %2").arg(path, QString::fromStdString(error.GetDescription())));
}
}
@ -2475,7 +2475,7 @@ void QtHost::UpdateApplicationLanguage(QWidget* dialog_parent)
// Qt base uses underscores instead of hyphens.
const QString qtbase_language = QString(qlanguage).replace(QChar('-'), QChar('_'));
QString base_path(QStringLiteral("%1/qt_%2.qm").arg(base_dir).arg(qtbase_language));
QString base_path(QStringLiteral("%1/qt_%2.qm").arg(base_dir, qtbase_language));
bool has_base_ts = QFile::exists(base_path);
if (!has_base_ts)
{
@ -2483,7 +2483,7 @@ void QtHost::UpdateApplicationLanguage(QWidget* dialog_parent)
const qsizetype index = qlanguage.lastIndexOf('-');
if (index > 0)
{
base_path = QStringLiteral("%1/qt_%2.qm").arg(base_dir).arg(qlanguage.left(index));
base_path = QStringLiteral("%1/qt_%2.qm").arg(base_dir, qlanguage.left(index));
has_base_ts = QFile::exists(base_path);
}
}
@ -2494,7 +2494,7 @@ void QtHost::UpdateApplicationLanguage(QWidget* dialog_parent)
{
QtUtils::MessageBoxWarning(
dialog_parent, QStringLiteral("Translation Error"),
QStringLiteral("Failed to load base translation file for '%1':\n%2").arg(qlanguage).arg(base_path));
QStringLiteral("Failed to load base translation file for '%1':\n%2").arg(qlanguage, base_path));
delete base_translator;
}
else
@ -2504,12 +2504,12 @@ void QtHost::UpdateApplicationLanguage(QWidget* dialog_parent)
}
}
const QString path = QStringLiteral("%1/duckstation-qt_%3.qm").arg(base_dir).arg(qlanguage);
const QString path = QStringLiteral("%1/duckstation-qt_%3.qm").arg(base_dir, qlanguage);
if (!QFile::exists(path))
{
QtUtils::MessageBoxWarning(
dialog_parent, QStringLiteral("Translation Error"),
QStringLiteral("Failed to find translation file for language '%1':\n%2").arg(qlanguage).arg(path));
QStringLiteral("Failed to find translation file for language '%1':\n%2").arg(qlanguage, path));
return;
}
@ -2518,7 +2518,7 @@ void QtHost::UpdateApplicationLanguage(QWidget* dialog_parent)
{
QtUtils::MessageBoxWarning(
dialog_parent, QStringLiteral("Translation Error"),
QStringLiteral("Failed to load translation file for language '%1':\n%2").arg(qlanguage).arg(path));
QStringLiteral("Failed to load translation file for language '%1':\n%2").arg(qlanguage, path));
delete translator;
return;
}
@ -2789,7 +2789,7 @@ QVariant InputDeviceListModel::data(const QModelIndex& index, int role /*= Qt::D
}
else
{
return QStringLiteral("%1\n%2").arg(dev.identifier).arg(dev.display_name);
return QStringLiteral("%1\n%2").arg(dev.identifier, dev.display_name);
}
}
else if (role == Qt::DecorationRole)

2
src/duckstation-qt/setupwizarddialog.cpp
Unescape Escape View File

@ -425,7 +425,7 @@ void SetupWizardDialog::openAutomaticMappingMenu(u32 port, QLabel* update_label)
{
// we set it as data, because the device list could get invalidated while the menu is up
menu->addAction(
InputDeviceListModel::getIconForKey(dev.key), QStringLiteral("%1 (%2)").arg(dev.identifier).arg(dev.display_name),
InputDeviceListModel::getIconForKey(dev.key), QStringLiteral("%1 (%2)").arg(dev.identifier, dev.display_name),
[this, port, update_label, device = dev.identifier]() { doDeviceAutomaticBinding(port, update_label, device); });
added = true;
}

Write Preview
Loading…
Cancel
Save