summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2015-09-11 00:23:00 -0400
committerGravatar Lioncash2015-09-11 00:57:24 -0400
commitabe5bb4019f84b5bcb43c581f1258b3a44f1f2c7 (patch)
tree9307673c985a0338efb8a409403b9ec90684005d /src/citra_qt/main.cpp
parentMerge pull request #1130 from lioncash/block (diff)
downloadyuzu-abe5bb4019f84b5bcb43c581f1258b3a44f1f2c7.tar.gz
yuzu-abe5bb4019f84b5bcb43c581f1258b3a44f1f2c7.tar.xz
yuzu-abe5bb4019f84b5bcb43c581f1258b3a44f1f2c7.zip
citra_qt: Reorganize headers
Diffstat (limited to 'src/citra_qt/main.cpp')
-rw-r--r--src/citra_qt/main.cpp54
1 files changed, 26 insertions, 28 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 609886dfd..d2c7459a4 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -4,51 +4,49 @@
4 4
5#include <thread> 5#include <thread>
6 6
7#include <QtGui>
8#include <QDesktopWidget> 7#include <QDesktopWidget>
8#include <QtGui>
9#include <QFileDialog> 9#include <QFileDialog>
10#include <QMessageBox> 10#include <QMessageBox>
11#include "qhexedit.h" 11#include "qhexedit.h"
12#include "main.h"
13 12
14#include "common/string_util.h" 13#include "citra_qt/bootmanager.h"
15#include "common/logging/text_formatter.h" 14#include "citra_qt/config.h"
16#include "common/logging/log.h" 15#include "citra_qt/hotkeys.h"
17#include "common/logging/backend.h" 16#include "citra_qt/main.h"
18#include "common/logging/filter.h" 17
18// Debugger
19#include "citra_qt/debugger/callstack.h"
20#include "citra_qt/debugger/disassembler.h"
21#include "citra_qt/debugger/graphics.h"
22#include "citra_qt/debugger/graphics_breakpoints.h"
23#include "citra_qt/debugger/graphics_cmdlists.h"
24#include "citra_qt/debugger/graphics_framebuffer.h"
25#include "citra_qt/debugger/graphics_tracing.h"
26#include "citra_qt/debugger/graphics_vertex_shader.h"
27#include "citra_qt/debugger/profiler.h"
28#include "citra_qt/debugger/ramview.h"
29#include "citra_qt/debugger/registers.h"
30
19#include "common/make_unique.h" 31#include "common/make_unique.h"
20#include "common/microprofile.h" 32#include "common/microprofile.h"
21#include "common/platform.h" 33#include "common/platform.h"
22#include "common/scm_rev.h" 34#include "common/scm_rev.h"
23#include "common/scope_exit.h" 35#include "common/scope_exit.h"
36#include "common/string_util.h"
37#include "common/logging/backend.h"
38#include "common/logging/filter.h"
39#include "common/logging/log.h"
40#include "common/logging/text_formatter.h"
24 41
25#include "bootmanager.h" 42#include "core/core.h"
26#include "hotkeys.h"
27
28//debugger
29#include "debugger/disassembler.h"
30#include "debugger/registers.h"
31#include "debugger/callstack.h"
32#include "debugger/ramview.h"
33#include "debugger/graphics.h"
34#include "debugger/graphics_breakpoints.h"
35#include "debugger/graphics_cmdlists.h"
36#include "debugger/graphics_framebuffer.h"
37#include "debugger/graphics_tracing.h"
38#include "debugger/graphics_vertex_shader.h"
39#include "debugger/profiler.h"
40
41#include "core/settings.h" 43#include "core/settings.h"
42#include "core/system.h" 44#include "core/system.h"
43#include "core/core.h"
44#include "core/loader/loader.h"
45#include "core/arm/disassembler/load_symbol_map.h" 45#include "core/arm/disassembler/load_symbol_map.h"
46#include "citra_qt/config.h" 46#include "core/loader/loader.h"
47 47
48#include "video_core/video_core.h" 48#include "video_core/video_core.h"
49 49
50#include "version.h"
51
52GMainWindow::GMainWindow() : emu_thread(nullptr) 50GMainWindow::GMainWindow() : emu_thread(nullptr)
53{ 51{
54 Pica::g_debug_context = Pica::DebugContext::Construct(); 52 Pica::g_debug_context = Pica::DebugContext::Construct();