summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2019-05-20 14:50:05 -0400
committerGravatar Lioncash2019-05-20 14:50:53 -0400
commitfd34732e2683c0342ea481ca43786f1e8ff4cf4d (patch)
tree98d46627ada2c194005e6680a9c91ec5ba26bc3e /src
parentyuzu/util: Specify string conversions explicitly (diff)
downloadyuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.tar.gz
yuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.tar.xz
yuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.zip
yuzu/bootmanager: Specify string conversions explicitly
Allows the bootmanager code to compile with implicit string conversions disabled.
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/bootmanager.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 810954b36..c2783d684 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -188,7 +188,9 @@ private:
188GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) 188GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread)
189 : QWidget(parent), emu_thread(emu_thread) { 189 : QWidget(parent), emu_thread(emu_thread) {
190 setWindowTitle(QStringLiteral("yuzu %1 | %2-%3") 190 setWindowTitle(QStringLiteral("yuzu %1 | %2-%3")
191 .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); 191 .arg(QString::fromUtf8(Common::g_build_name),
192 QString::fromUtf8(Common::g_scm_branch),
193 QString::fromUtf8(Common::g_scm_desc)));
192 setAttribute(Qt::WA_AcceptTouchEvents); 194 setAttribute(Qt::WA_AcceptTouchEvents);
193 195
194 InputCommon::Init(); 196 InputCommon::Init();
@@ -217,7 +219,7 @@ void GRenderWindow::SwapBuffers() {
217 // However: 219 // However:
218 // - The Qt debug runtime prints a bogus warning on the console if `makeCurrent` wasn't called 220 // - The Qt debug runtime prints a bogus warning on the console if `makeCurrent` wasn't called
219 // since the last time `swapBuffers` was executed; 221 // since the last time `swapBuffers` was executed;
220 // - On macOS, if `makeCurrent` isn't called explicitely, resizing the buffer breaks. 222 // - On macOS, if `makeCurrent` isn't called explicitly, resizing the buffer breaks.
221 context->makeCurrent(child); 223 context->makeCurrent(child);
222 224
223 context->swapBuffers(child); 225 context->swapBuffers(child);