summaryrefslogtreecommitdiff
path: root/src/citra_qt/bootmanager.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt/bootmanager.h')
-rw-r--r--src/citra_qt/bootmanager.h31
1 files changed, 18 insertions, 13 deletions
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index c1da2bc5f..e0e4341df 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -19,8 +19,7 @@ class GGLWidgetInternal;
19class GMainWindow; 19class GMainWindow;
20class GRenderWindow; 20class GRenderWindow;
21 21
22class EmuThread : public QThread 22class EmuThread : public QThread {
23{
24 Q_OBJECT 23 Q_OBJECT
25 24
26public: 25public:
@@ -58,7 +57,9 @@ public:
58 * @return True if the emulation thread is running, otherwise false 57 * @return True if the emulation thread is running, otherwise false
59 * @note This function is thread-safe 58 * @note This function is thread-safe
60 */ 59 */
61 bool IsRunning() { return running; } 60 bool IsRunning() {
61 return running;
62 }
62 63
63 /** 64 /**
64 * Requests for the emulation thread to stop running 65 * Requests for the emulation thread to stop running
@@ -81,20 +82,23 @@ signals:
81 /** 82 /**
82 * Emitted when the CPU has halted execution 83 * Emitted when the CPU has halted execution
83 * 84 *
84 * @warning When connecting to this signal from other threads, make sure to specify either Qt::QueuedConnection (invoke slot within the destination object's message thread) or even Qt::BlockingQueuedConnection (additionally block source thread until slot returns) 85 * @warning When connecting to this signal from other threads, make sure to specify either
86 * Qt::QueuedConnection (invoke slot within the destination object's message thread) or even
87 * Qt::BlockingQueuedConnection (additionally block source thread until slot returns)
85 */ 88 */
86 void DebugModeEntered(); 89 void DebugModeEntered();
87 90
88 /** 91 /**
89 * Emitted right before the CPU continues execution 92 * Emitted right before the CPU continues execution
90 * 93 *
91 * @warning When connecting to this signal from other threads, make sure to specify either Qt::QueuedConnection (invoke slot within the destination object's message thread) or even Qt::BlockingQueuedConnection (additionally block source thread until slot returns) 94 * @warning When connecting to this signal from other threads, make sure to specify either
95 * Qt::QueuedConnection (invoke slot within the destination object's message thread) or even
96 * Qt::BlockingQueuedConnection (additionally block source thread until slot returns)
92 */ 97 */
93 void DebugModeLeft(); 98 void DebugModeLeft();
94}; 99};
95 100
96class GRenderWindow : public QWidget, public EmuWindow 101class GRenderWindow : public QWidget, public EmuWindow {
97{
98 Q_OBJECT 102 Q_OBJECT
99 103
100public: 104public:
@@ -109,7 +113,7 @@ public:
109 void BackupGeometry(); 113 void BackupGeometry();
110 void RestoreGeometry(); 114 void RestoreGeometry();
111 void restoreGeometry(const QByteArray& geometry); // overridden 115 void restoreGeometry(const QByteArray& geometry); // overridden
112 QByteArray saveGeometry(); // overridden 116 QByteArray saveGeometry(); // overridden
113 117
114 qreal windowPixelRatio(); 118 qreal windowPixelRatio();
115 119
@@ -118,9 +122,9 @@ public:
118 void keyPressEvent(QKeyEvent* event) override; 122 void keyPressEvent(QKeyEvent* event) override;
119 void keyReleaseEvent(QKeyEvent* event) override; 123 void keyReleaseEvent(QKeyEvent* event) override;
120 124
121 void mousePressEvent(QMouseEvent *event) override; 125 void mousePressEvent(QMouseEvent* event) override;
122 void mouseMoveEvent(QMouseEvent *event) override; 126 void mouseMoveEvent(QMouseEvent* event) override;
123 void mouseReleaseEvent(QMouseEvent *event) override; 127 void mouseReleaseEvent(QMouseEvent* event) override;
124 128
125 void ReloadSetKeymaps() override; 129 void ReloadSetKeymaps() override;
126 130
@@ -129,7 +133,7 @@ public:
129 void InitRenderTarget(); 133 void InitRenderTarget();
130 134
131public slots: 135public slots:
132 void moveContext(); // overridden 136 void moveContext(); // overridden
133 137
134 void OnEmulationStarting(EmuThread* emu_thread); 138 void OnEmulationStarting(EmuThread* emu_thread);
135 void OnEmulationStopping(); 139 void OnEmulationStopping();
@@ -140,7 +144,8 @@ signals:
140 void Closed(); 144 void Closed();
141 145
142private: 146private:
143 void OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) override; 147 void
148 OnMinimalClientAreaChangeRequest(const std::pair<unsigned, unsigned>& minimal_size) override;
144 149
145 GGLWidgetInternal* child; 150 GGLWidgetInternal* child;
146 151