summaryrefslogtreecommitdiff
path: root/src/yuzu/about_dialog.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-05-09 01:18:28 -0400
committerLioncash <mathew1800@gmail.com>2019-05-09 01:18:37 -0400
commitbf1829a717b9e917041006a878111d516cbedd33 (patch)
treeb0213242c77c1f3cbc06c8010b0a1bbfaf99875a /src/yuzu/about_dialog.cpp
parent75a8b304d464525a260f0bd8ad2a7f8708c80ed2 (diff)
yuzu/about_dialog: Specify string conversions explicitly
Specifies the conversions explicitly to avoid implicit conversions from const char* to QString. This makes it easier to disable implicit QString conversions in the future. In this case, the implicit conversion was technically wrong as well. The implicit conversion treats the input strings as ASCII characters. This would result in an incorrect conversion being performed in the rare case a branch name was created with a non-ASCII Unicode character, likely resulting in junk being displayed.
Diffstat (limited to 'src/yuzu/about_dialog.cpp')
-rw-r--r--src/yuzu/about_dialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp
index 3efa65a38..d39b3f07a 100644
--- a/src/yuzu/about_dialog.cpp
+++ b/src/yuzu/about_dialog.cpp
@@ -9,10 +9,10 @@
AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) {
ui->setupUi(this);
- ui->labelLogo->setPixmap(QIcon::fromTheme("yuzu").pixmap(200));
- ui->labelBuildInfo->setText(
- ui->labelBuildInfo->text().arg(Common::g_build_fullname, Common::g_scm_branch,
- Common::g_scm_desc, QString(Common::g_build_date).left(10)));
+ ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200));
+ ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg(
+ QString::fromUtf8(Common::g_build_fullname), QString::fromUtf8(Common::g_scm_branch),
+ QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10)));
}
AboutDialog::~AboutDialog() = default;