diff options
| author | 2014-04-30 20:12:01 -0700 | |
|---|---|---|
| committer | 2014-04-30 20:13:28 -0700 | |
| commit | 704075f04a8adda82141f3c68addfd6c34a08765 (patch) | |
| tree | 4f2d735372ffd90d59ec0cac28da76411c7c758f /src/citra_qt/bootmanager.cpp | |
| parent | Reverse debugging changes (diff) | |
| download | yuzu-704075f04a8adda82141f3c68addfd6c34a08765.tar.gz yuzu-704075f04a8adda82141f3c68addfd6c34a08765.tar.xz yuzu-704075f04a8adda82141f3c68addfd6c34a08765.zip | |
Fixed indents
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 52b39eb27..bd01b78c5 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -47,7 +47,7 @@ void EmuThread::run() | |||
| 47 | 47 | ||
| 48 | void EmuThread::Stop() | 48 | void EmuThread::Stop() |
| 49 | { | 49 | { |
| 50 | if (!isRunning()) | 50 | if (!isRunning()) |
| 51 | { | 51 | { |
| 52 | INFO_LOG(MASTER_LOG, "EmuThread::Stop called while emu thread wasn't running, returning..."); | 52 | INFO_LOG(MASTER_LOG, "EmuThread::Stop called while emu thread wasn't running, returning..."); |
| 53 | return; | 53 | return; |
| @@ -62,7 +62,7 @@ void EmuThread::Stop() | |||
| 62 | terminate(); | 62 | terminate(); |
| 63 | wait(1000); | 63 | wait(1000); |
| 64 | if (isRunning()) | 64 | if (isRunning()) |
| 65 | WARN_LOG(MASTER_LOG, "EmuThread STILL running, something is wrong here..."); | 65 | WARN_LOG(MASTER_LOG, "EmuThread STILL running, something is wrong here..."); |
| 66 | } | 66 | } |
| 67 | INFO_LOG(MASTER_LOG, "EmuThread stopped"); | 67 | INFO_LOG(MASTER_LOG, "EmuThread stopped"); |
| 68 | } | 68 | } |
| @@ -75,8 +75,8 @@ class GGLWidgetInternal : public QGLWidget | |||
| 75 | public: | 75 | public: |
| 76 | GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent) : QGLWidget(parent) | 76 | GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent) : QGLWidget(parent) |
| 77 | { | 77 | { |
| 78 | doneCurrent(); | 78 | doneCurrent(); |
| 79 | parent_ = parent; | 79 | parent_ = parent; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | void paintEvent(QPaintEvent* ev) | 82 | void paintEvent(QPaintEvent* ev) |
| @@ -102,12 +102,12 @@ EmuThread& GRenderWindow::GetEmuThread() | |||
| 102 | GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this) | 102 | GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this) |
| 103 | { | 103 | { |
| 104 | // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose | 104 | // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose |
| 105 | QGLFormat fmt; | 105 | QGLFormat fmt; |
| 106 | fmt.setProfile(QGLFormat::CoreProfile); | 106 | fmt.setProfile(QGLFormat::CoreProfile); |
| 107 | fmt.setVersion(4,1); | 107 | fmt.setVersion(4,1); |
| 108 | fmt.setSampleBuffers(true); | 108 | fmt.setSampleBuffers(true); |
| 109 | fmt.setSamples(4); | 109 | fmt.setSamples(4); |
| 110 | 110 | ||
| 111 | child = new GGLWidgetInternal(fmt, this); | 111 | child = new GGLWidgetInternal(fmt, this); |
| 112 | QBoxLayout* layout = new QHBoxLayout(this); | 112 | QBoxLayout* layout = new QHBoxLayout(this); |
| 113 | resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); | 113 | resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); |
| @@ -148,12 +148,12 @@ void GRenderWindow::DoneCurrent() | |||
| 148 | void GRenderWindow::PollEvents() { | 148 | void GRenderWindow::PollEvents() { |
| 149 | // TODO(ShizZy): Does this belong here? This is a reasonable place to update the window title | 149 | // TODO(ShizZy): Does this belong here? This is a reasonable place to update the window title |
| 150 | // from the main thread, but this should probably be in an event handler... | 150 | // from the main thread, but this should probably be in an event handler... |
| 151 | /* | 151 | /* |
| 152 | static char title[128]; | 152 | static char title[128]; |
| 153 | sprintf(title, "%s (FPS: %02.02f)", window_title_.c_str(), | 153 | sprintf(title, "%s (FPS: %02.02f)", window_title_.c_str(), |
| 154 | video_core::g_renderer->current_fps()); | 154 | video_core::g_renderer->current_fps()); |
| 155 | setWindowTitle(title); | 155 | setWindowTitle(title); |
| 156 | */ | 156 | */ |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | void GRenderWindow::BackupGeometry() | 159 | void GRenderWindow::BackupGeometry() |
| @@ -186,26 +186,26 @@ QByteArray GRenderWindow::saveGeometry() | |||
| 186 | 186 | ||
| 187 | void GRenderWindow::keyPressEvent(QKeyEvent* event) | 187 | void GRenderWindow::keyPressEvent(QKeyEvent* event) |
| 188 | { | 188 | { |
| 189 | /* | 189 | /* |
| 190 | bool key_processed = false; | 190 | bool key_processed = false; |
| 191 | for (unsigned int channel = 0; channel < 4 && controller_interface(); ++channel) | 191 | for (unsigned int channel = 0; channel < 4 && controller_interface(); ++channel) |
| 192 | if (controller_interface()->SetControllerStatus(channel, event->key(), input_common::GCController::PRESSED)) | 192 | if (controller_interface()->SetControllerStatus(channel, event->key(), input_common::GCController::PRESSED)) |
| 193 | key_processed = true; | 193 | key_processed = true; |
| 194 | 194 | ||
| 195 | if (!key_processed) | 195 | if (!key_processed) |
| 196 | QWidget::keyPressEvent(event); | 196 | QWidget::keyPressEvent(event); |
| 197 | */ | 197 | */ |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | void GRenderWindow::keyReleaseEvent(QKeyEvent* event) | 200 | void GRenderWindow::keyReleaseEvent(QKeyEvent* event) |
| 201 | { | 201 | { |
| 202 | /* | 202 | /* |
| 203 | bool key_processed = false; | 203 | bool key_processed = false; |
| 204 | for (unsigned int channel = 0; channel < 4 && controller_interface(); ++channel) | 204 | for (unsigned int channel = 0; channel < 4 && controller_interface(); ++channel) |
| 205 | if (controller_interface()->SetControllerStatus(channel, event->key(), input_common::GCController::RELEASED)) | 205 | if (controller_interface()->SetControllerStatus(channel, event->key(), input_common::GCController::RELEASED)) |
| 206 | key_processed = true; | 206 | key_processed = true; |
| 207 | 207 | ||
| 208 | if (!key_processed) | 208 | if (!key_processed) |
| 209 | QWidget::keyPressEvent(event); | 209 | QWidget::keyPressEvent(event); |
| 210 | */ | 210 | */ |
| 211 | } \ No newline at end of file | 211 | } \ No newline at end of file |