summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilverBeamx <molto.falso@gmail.com>2020-04-07 22:59:09 +0200
committerSilverBeamx <molto.falso@gmail.com>2020-04-07 22:59:09 +0200
commit863f7385dc6f7c232877bbabb5ff1068d06a7f96 (patch)
tree4697de74596143ef07f6c8c9dd7e252bda24d24a
parentRemoved leftover test code (diff)
downloadyuzu-863f7385dc6f7c232877bbabb5ff1068d06a7f96.tar
yuzu-863f7385dc6f7c232877bbabb5ff1068d06a7f96.tar.gz
yuzu-863f7385dc6f7c232877bbabb5ff1068d06a7f96.tar.bz2
yuzu-863f7385dc6f7c232877bbabb5ff1068d06a7f96.tar.lz
yuzu-863f7385dc6f7c232877bbabb5ff1068d06a7f96.tar.xz
yuzu-863f7385dc6f7c232877bbabb5ff1068d06a7f96.tar.zst
yuzu-863f7385dc6f7c232877bbabb5ff1068d06a7f96.zip
-rw-r--r--src/yuzu/about_dialog.cpp7
-rw-r--r--src/yuzu/main.cpp4
2 files changed, 6 insertions, 5 deletions
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp
index e7985c8a7..695b2ef5f 100644
--- a/src/yuzu/about_dialog.cpp
+++ b/src/yuzu/about_dialog.cpp
@@ -11,13 +11,14 @@
AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) {
const auto build_id = std::string(Common::g_build_id);
const auto fmt = std::string(Common::g_title_bar_format_idle);
- const auto yuzuBuildVersion = fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{},
- std::string{}, std::string{}, std::string{}, build_id);
+ const auto yuzu_build_version =
+ fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{},
+ std::string{}, std::string{}, std::string{}, build_id);
ui->setupUi(this);
ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200));
ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg(
- QString::fromStdString(yuzuBuildVersion), QString::fromUtf8(Common::g_scm_branch),
+ QString::fromStdString(yuzu_build_version), QString::fromUtf8(Common::g_scm_branch),
QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10)));
}
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 5cefb5d72..1717e06f9 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -207,11 +207,11 @@ GMainWindow::GMainWindow()
const auto build_id = std::string(Common::g_build_id);
const auto fmt = std::string(Common::g_title_bar_format_idle);
- const auto yuzuBuildVersion =
+ const auto yuzu_build_version =
fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{},
std::string{}, std::string{}, std::string{}, build_id);
- LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", yuzuBuildVersion, Common::g_scm_branch,
+ LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", yuzu_build_version, Common::g_scm_branch,
Common::g_scm_desc);
#ifdef ARCHITECTURE_x86_64
LOG_INFO(Frontend, "Host CPU: {}", Common::GetCPUCaps().cpu_string);