Просмотр исходного кода

Merge pull request #2414 from lioncash/reorder

yuzu/bootmanager: Resolve constructor initializer list warnings
bunnei 7 лет назад
Родитель
Сommit
cd38eadcc1
2 измененных файлов с 3 добавлено и 5 удалено
  1. 3 4
      src/yuzu/bootmanager.cpp
  2. 0 1
      src/yuzu/bootmanager.h

+ 3 - 4
src/yuzu/bootmanager.cpp

@@ -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() {
-        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.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);

+ 0 - 1
src/yuzu/bootmanager.h

@@ -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"