diff options
| author | 2016-09-21 00:21:23 +0900 | |
|---|---|---|
| committer | 2016-09-21 11:15:47 +0900 | |
| commit | ebdae19fd226104baec712b9da9939ff82ef3c3a (patch) | |
| tree | e046c0f562fc4400480b2e3257f140e973a9ce6a /src/citra_qt/main.cpp | |
| parent | Manually tweak source formatting and then re-run clang-format (diff) | |
| download | yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.gz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.xz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.zip | |
Remove empty newlines in #include blocks.
This makes clang-format useful on those.
Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.
Diffstat (limited to '')
| -rw-r--r-- | src/citra_qt/main.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index e10314856..82667446b 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -5,25 +5,15 @@ | |||
| 5 | #include <clocale> | 5 | #include <clocale> |
| 6 | #include <memory> | 6 | #include <memory> |
| 7 | #include <thread> | 7 | #include <thread> |
| 8 | |||
| 9 | #include <glad/glad.h> | 8 | #include <glad/glad.h> |
| 10 | |||
| 11 | #define QT_NO_OPENGL | 9 | #define QT_NO_OPENGL |
| 12 | #include <QDesktopWidget> | 10 | #include <QDesktopWidget> |
| 13 | #include <QFileDialog> | 11 | #include <QFileDialog> |
| 14 | #include <QMessageBox> | 12 | #include <QMessageBox> |
| 15 | #include <QtGui> | 13 | #include <QtGui> |
| 16 | #include "qhexedit.h" | ||
| 17 | |||
| 18 | #include "citra_qt/bootmanager.h" | 14 | #include "citra_qt/bootmanager.h" |
| 19 | #include "citra_qt/config.h" | 15 | #include "citra_qt/config.h" |
| 20 | #include "citra_qt/configure_dialog.h" | 16 | #include "citra_qt/configure_dialog.h" |
| 21 | #include "citra_qt/game_list.h" | ||
| 22 | #include "citra_qt/hotkeys.h" | ||
| 23 | #include "citra_qt/main.h" | ||
| 24 | #include "citra_qt/ui_settings.h" | ||
| 25 | |||
| 26 | // Debugger | ||
| 27 | #include "citra_qt/debugger/callstack.h" | 17 | #include "citra_qt/debugger/callstack.h" |
| 28 | #include "citra_qt/debugger/disassembler.h" | 18 | #include "citra_qt/debugger/disassembler.h" |
| 29 | #include "citra_qt/debugger/graphics.h" | 19 | #include "citra_qt/debugger/graphics.h" |
| @@ -35,7 +25,10 @@ | |||
| 35 | #include "citra_qt/debugger/profiler.h" | 25 | #include "citra_qt/debugger/profiler.h" |
| 36 | #include "citra_qt/debugger/ramview.h" | 26 | #include "citra_qt/debugger/ramview.h" |
| 37 | #include "citra_qt/debugger/registers.h" | 27 | #include "citra_qt/debugger/registers.h" |
| 38 | 28 | #include "citra_qt/game_list.h" | |
| 29 | #include "citra_qt/hotkeys.h" | ||
| 30 | #include "citra_qt/main.h" | ||
| 31 | #include "citra_qt/ui_settings.h" | ||
| 39 | #include "common/logging/backend.h" | 32 | #include "common/logging/backend.h" |
| 40 | #include "common/logging/filter.h" | 33 | #include "common/logging/filter.h" |
| 41 | #include "common/logging/log.h" | 34 | #include "common/logging/log.h" |
| @@ -45,14 +38,13 @@ | |||
| 45 | #include "common/scm_rev.h" | 38 | #include "common/scm_rev.h" |
| 46 | #include "common/scope_exit.h" | 39 | #include "common/scope_exit.h" |
| 47 | #include "common/string_util.h" | 40 | #include "common/string_util.h" |
| 48 | |||
| 49 | #include "core/arm/disassembler/load_symbol_map.h" | 41 | #include "core/arm/disassembler/load_symbol_map.h" |
| 50 | #include "core/core.h" | 42 | #include "core/core.h" |
| 51 | #include "core/gdbstub/gdbstub.h" | 43 | #include "core/gdbstub/gdbstub.h" |
| 52 | #include "core/loader/loader.h" | 44 | #include "core/loader/loader.h" |
| 53 | #include "core/settings.h" | 45 | #include "core/settings.h" |
| 54 | #include "core/system.h" | 46 | #include "core/system.h" |
| 55 | 47 | #include "qhexedit.h" | |
| 56 | #include "video_core/video_core.h" | 48 | #include "video_core/video_core.h" |
| 57 | 49 | ||
| 58 | GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { | 50 | GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { |