yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #2414 from lioncash/reorder 

yuzu/bootmanager: Resolve constructor initializer list warnings
This commit is contained in:
bunnei 2019-04-19 19:11:47 -04:00 committed by GitHub
parent b6faea0dd2 54e9f9b6ed
commit cd38eadcc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/yuzu/bootmanager.cpp
View File

@ -91,8 +91,8 @@ void EmuThread::run() {
class GGLContext : public Core::Frontend::GraphicsContext { class GGLContext : public Core::Frontend::GraphicsContext {
public: public:
explicit GGLContext(QOpenGLContext* shared_context) : surface() { explicit GGLContext(QOpenGLContext* shared_context)
context = std::make_unique<QOpenGLContext>(shared_context); : context{std::make_unique<QOpenGLContext>(shared_context)} {
surface.setFormat(shared_context->format()); surface.setFormat(shared_context->format());
surface.create(); surface.create();
} }
@ -186,8 +186,7 @@ private:
}; };
GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread)
: QWidget(parent), child(nullptr), context(nullptr), emu_thread(emu_thread) { : QWidget(parent), emu_thread(emu_thread) {
setWindowTitle(QStringLiteral("yuzu %1 | %2-%3") setWindowTitle(QStringLiteral("yuzu %1 | %2-%3")
.arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc));
setAttribute(Qt::WA_AcceptTouchEvents); setAttribute(Qt::WA_AcceptTouchEvents);

1
src/yuzu/bootmanager.h
View File

@ -10,7 +10,6 @@
#include <QImage> #include <QImage>
#include <QThread> #include <QThread>
#include <QWidget> #include <QWidget>
#include "common/thread.h"
#include "core/core.h" #include "core/core.h"
#include "core/frontend/emu_window.h" #include "core/frontend/emu_window.h"