summaryrefslogtreecommitdiff
path: root/src/citra_qt/bootmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r--src/citra_qt/bootmanager.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 01cc6b9ca..53d035b32 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -28,8 +28,7 @@
28#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" 28#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
29 29
30EmuThread::EmuThread(GRenderWindow* render_window) 30EmuThread::EmuThread(GRenderWindow* render_window)
31 : exec_step(false), running(false), stop_run(false), render_window(render_window) { 31 : exec_step(false), running(false), stop_run(false), render_window(render_window) {}
32}
33 32
34void EmuThread::run() { 33void EmuThread::run() {
35 render_window->MakeCurrent(); 34 render_window->MakeCurrent();
@@ -84,8 +83,7 @@ void EmuThread::run() {
84class GGLWidgetInternal : public QGLWidget { 83class GGLWidgetInternal : public QGLWidget {
85public: 84public:
86 GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent) 85 GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent)
87 : QGLWidget(fmt, parent), parent(parent) { 86 : QGLWidget(fmt, parent), parent(parent) {}
88 }
89 87
90 void paintEvent(QPaintEvent* ev) override { 88 void paintEvent(QPaintEvent* ev) override {
91 if (do_painting) { 89 if (do_painting) {
@@ -153,8 +151,7 @@ void GRenderWindow::DoneCurrent() {
153 child->doneCurrent(); 151 child->doneCurrent();
154} 152}
155 153
156void GRenderWindow::PollEvents() { 154void GRenderWindow::PollEvents() {}
157}
158 155
159// On Qt 5.0+, this correctly gets the size of the framebuffer (pixels). 156// On Qt 5.0+, this correctly gets the size of the framebuffer (pixels).
160// 157//
@@ -306,8 +303,8 @@ void GRenderWindow::OnEmulationStopping() {
306void GRenderWindow::showEvent(QShowEvent* event) { 303void GRenderWindow::showEvent(QShowEvent* event) {
307 QWidget::showEvent(event); 304 QWidget::showEvent(event);
308 305
309// windowHandle() is not initialized until the Window is shown, so we connect it here.
310#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) 306#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
307 // windowHandle() is not initialized until the Window is shown, so we connect it here.
311 connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this, 308 connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this,
312 SLOT(OnFramebufferSizeChanged()), Qt::UniqueConnection); 309 SLOT(OnFramebufferSizeChanged()), Qt::UniqueConnection);
313#endif 310#endif