summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-04-20 01:11:47 +0200
committerGitHub <noreply@github.com>2019-04-20 01:11:47 +0200
commitcd38eadcc1bdbc10320c24ad3d5c9e017e917738 (patch)
treef638ed61f08270a5dd7b72bd59829f8521c8d6a7 /src
parentMerge pull request #2421 from lioncash/svc-call (diff)
parentyuzu/bootmanager: Replace unnnecessary constructor initializer list member of GGLContext (diff)
downloadyuzu-cd38eadcc1bdbc10320c24ad3d5c9e017e917738.tar
yuzu-cd38eadcc1bdbc10320c24ad3d5c9e017e917738.tar.gz
yuzu-cd38eadcc1bdbc10320c24ad3d5c9e017e917738.tar.bz2
yuzu-cd38eadcc1bdbc10320c24ad3d5c9e017e917738.tar.lz
yuzu-cd38eadcc1bdbc10320c24ad3d5c9e017e917738.tar.xz
yuzu-cd38eadcc1bdbc10320c24ad3d5c9e017e917738.tar.zst
yuzu-cd38eadcc1bdbc10320c24ad3d5c9e017e917738.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/bootmanager.cpp7
-rw-r--r--src/yuzu/bootmanager.h1
2 files changed, 3 insertions, 5 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index c29f2d2dc..7eed9fcf3 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -91,8 +91,8 @@ void EmuThread::run() {
class GGLContext : public Core::Frontend::GraphicsContext {
public:
- explicit GGLContext(QOpenGLContext* shared_context) : surface() {
- context = std::make_unique<QOpenGLContext>(shared_context);
+ explicit GGLContext(QOpenGLContext* shared_context)
+ : context{std::make_unique<QOpenGLContext>(shared_context)} {
surface.setFormat(shared_context->format());
surface.create();
}
@@ -186,8 +186,7 @@ private:
};
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")
.arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc));
setAttribute(Qt::WA_AcceptTouchEvents);
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index 9608b959f..3df33aca1 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/bootmanager.h
@@ -10,7 +10,6 @@
#include <QImage>
#include <QThread>
#include <QWidget>
-#include "common/thread.h"
#include "core/core.h"
#include "core/frontend/emu_window.h"