octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1566 from lioncash/str 

bootmanager: Use QStringLiteral instead of std::string to represent the window title.
This commit is contained in:
bunnei 2018-10-24 17:12:53 -04:00 committed by GitHub
parent ddff188c65 2cbc284c2b
commit e6e17a3fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/yuzu/bootmanager.cpp
View File

@ -8,7 +8,6 @@
#include "common/microprofile.h" #include "common/microprofile.h"
#include "common/scm_rev.h" #include "common/scm_rev.h"
#include "common/string_util.h"
#include "core/core.h" #include "core/core.h"
#include "core/frontend/framebuffer_layout.h" #include "core/frontend/framebuffer_layout.h"
#include "core/settings.h" #include "core/settings.h"
@ -107,9 +106,8 @@ private:
GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread)
: QWidget(parent), child(nullptr), emu_thread(emu_thread) { : QWidget(parent), child(nullptr), emu_thread(emu_thread) {
std::string window_title = fmt::format("yuzu {} | {}-{}", Common::g_build_name, setWindowTitle(QStringLiteral("yuzu %1 | %2-%3")
Common::g_scm_branch, Common::g_scm_desc); .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc));
setWindowTitle(QString::fromStdString(window_title));
setAttribute(Qt::WA_AcceptTouchEvents); setAttribute(Qt::WA_AcceptTouchEvents);
InputCommon::Init(); InputCommon::Init();