From 3a771a13dcfd1de061e886e081393fca1fd1e689 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 20 Jun 2015 23:36:19 +0100 Subject: Common: Cleanup profiler includes. --- src/common/profiler_reporting.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/common/profiler_reporting.h') diff --git a/src/common/profiler_reporting.h b/src/common/profiler_reporting.h index 3abb7331..ab60cfb1 100644 --- a/src/common/profiler_reporting.h +++ b/src/common/profiler_reporting.h @@ -4,10 +4,8 @@ #pragma once -#include #include -#include -#include +#include #include #include "common/profiler.h" -- cgit v1.2.3 From 45c4781544624c85a8178c6ee445cfe6a4751910 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 21 Jun 2015 14:58:59 +0100 Subject: CitraQt: Cleanup includes. --- src/citra_qt/bootmanager.cpp | 4 ++++ src/citra_qt/config.cpp | 2 +- src/citra_qt/config.h | 4 ++-- src/citra_qt/debugger/disassembler.cpp | 2 ++ src/citra_qt/hotkeys.cpp | 5 ++++- src/citra_qt/hotkeys.h | 4 ++-- src/citra_qt/main.cpp | 2 ++ src/common/logging/filter.h | 1 + src/common/profiler_reporting.h | 1 - src/core/file_sys/ivfc_archive.cpp | 1 + src/core/hle/service/gsp_gpu.cpp | 4 +++- src/core/hle/service/hid/hid.cpp | 1 + src/core/hle/service/y2r_u.cpp | 1 + src/core/hw/gpu.cpp | 1 + src/core/loader/elf.cpp | 3 ++- src/core/loader/loader.h | 7 ++++++- src/core/loader/ncch.cpp | 3 ++- src/video_core/command_processor.cpp | 12 +++++++----- src/video_core/debug_utils/debug_utils.cpp | 1 + src/video_core/renderer_base.h | 2 ++ 20 files changed, 45 insertions(+), 16 deletions(-) (limited to 'src/common/profiler_reporting.h') diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 3db09c65..9d36364d 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -11,6 +11,10 @@ #include "bootmanager.h" #include "main.h" +#include "common/string_util.h" +#include "common/scm_rev.h" +#include "common/key_map.h" + #include "core/core.h" #include "core/settings.h" #include "core/system.h" diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index 2a9af1f3..5c056446 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include "core/settings.h" -#include "core/core.h" #include "common/file_util.h" #include "config.h" diff --git a/src/citra_qt/config.h b/src/citra_qt/config.h index 4485cae7..dd0b2ef0 100644 --- a/src/citra_qt/config.h +++ b/src/citra_qt/config.h @@ -4,9 +4,9 @@ #pragma once -#include +#include -#include "common/common_types.h" +class QSettings; class Config { QSettings* qt_config; diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index e99ec1b3..b41c40a0 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include + #include "disassembler.h" #include "../bootmanager.h" diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index 322c25c9..5ed6cf0b 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp @@ -2,10 +2,13 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include + #include #include +#include + #include "hotkeys.h" -#include struct Hotkey { diff --git a/src/citra_qt/hotkeys.h b/src/citra_qt/hotkeys.h index 75c7cc62..2317f818 100644 --- a/src/citra_qt/hotkeys.h +++ b/src/citra_qt/hotkeys.h @@ -2,12 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include -#include #include "ui_hotkeys.h" +class QDialog; class QKeySequence; class QSettings; +class QShortcut; /** * Register a hotkey. diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 43b80a34..d23bafaf 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -10,12 +10,14 @@ #include "qhexedit.h" #include "main.h" +#include "common/string_util.h" #include "common/logging/text_formatter.h" #include "common/logging/log.h" #include "common/logging/backend.h" #include "common/logging/filter.h" #include "common/make_unique.h" #include "common/platform.h" +#include "common/scm_rev.h" #include "common/scope_exit.h" #include "bootmanager.h" diff --git a/src/common/logging/filter.h b/src/common/logging/filter.h index 0b71ea3b..a2b4eca4 100644 --- a/src/common/logging/filter.h +++ b/src/common/logging/filter.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include "common/logging/log.h" diff --git a/src/common/profiler_reporting.h b/src/common/profiler_reporting.h index ab60cfb1..df98e05b 100644 --- a/src/common/profiler_reporting.h +++ b/src/common/profiler_reporting.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp index 2d2509d1..d11d42bb 100644 --- a/src/core/file_sys/ivfc_archive.cpp +++ b/src/core/file_sys/ivfc_archive.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include "common/common_types.h" diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp index 4b0b4229..f56bbe50 100644 --- a/src/core/hle/service/gsp_gpu.cpp +++ b/src/core/hle/service/gsp_gpu.cpp @@ -9,14 +9,16 @@ #include "core/hle/kernel/event.h" #include "core/hle/kernel/shared_memory.h" #include "core/hle/result.h" -#include "gsp_gpu.h" #include "core/hw/hw.h" #include "core/hw/gpu.h" #include "core/hw/lcd.h" #include "video_core/gpu_debugger.h" +#include "video_core/renderer_base.h" #include "video_core/video_core.h" +#include "gsp_gpu.h" + // Main graphics debugger object - TODO: Here is probably not the best place for this GraphicsDebugger g_debugger; diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index c7c1bb5a..70caa7d8 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "common/logging/log.h" +#include "common/emu_window.h" #include "core/hle/service/service.h" #include "core/hle/service/hid/hid.h" diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp index ac1967da..e121a54e 100644 --- a/src/core/hle/service/y2r_u.cpp +++ b/src/core/hle/service/y2r_u.cpp @@ -12,6 +12,7 @@ #include "core/hw/y2r.h" #include "core/mem_map.h" +#include "video_core/renderer_base.h" #include "video_core/utils.h" #include "video_core/video_core.h" diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 7471def5..bdceb698 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -21,6 +21,7 @@ #include "core/hw/gpu.h" #include "video_core/command_processor.h" +#include "video_core/renderer_base.h" #include "video_core/utils.h" #include "video_core/video_core.h" diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index f00753a7..a7eea78a 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include @@ -10,7 +11,7 @@ #include "common/logging/log.h" #include "common/symbols.h" -#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/process.h" #include "core/hle/kernel/resource_limit.h" #include "core/loader/elf.h" #include "core/memory.h" diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 1c33b1c1..52bbf35b 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -4,13 +4,18 @@ #pragma once +#include +#include #include +#include #include #include "common/common_types.h" #include "common/file_util.h" -#include "core/hle/kernel/process.h" +namespace Kernel { +struct AddressMapping; +} //////////////////////////////////////////////////////////////////////////////////////////////////// // Loader namespace diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 08993c4f..a8f8f78b 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include #include "common/logging/log.h" @@ -10,7 +11,7 @@ #include "common/string_util.h" #include "common/swap.h" -#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/process.h" #include "core/hle/kernel/resource_limit.h" #include "core/loader/ncch.h" #include "core/memory.h" diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index b46fadd9..110caec7 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -6,18 +6,20 @@ #include "common/profiler.h" +#include "core/hle/service/gsp_gpu.h" +#include "core/hw/gpu.h" +#include "core/settings.h" + +#include "debug_utils/debug_utils.h" + #include "clipper.h" #include "command_processor.h" #include "math.h" #include "pica.h" #include "primitive_assembly.h" +#include "renderer_base.h" #include "vertex_shader.h" #include "video_core.h" -#include "core/hle/service/gsp_gpu.h" -#include "core/hw/gpu.h" -#include "core/settings.h" - -#include "debug_utils/debug_utils.h" namespace Pica { diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 7b8ab72b..d24c0f11 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -23,6 +23,7 @@ #include "common/vector_math.h" #include "video_core/pica.h" +#include "video_core/renderer_base.h" #include "video_core/utils.h" #include "video_core/video_core.h" diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index 5757ac75..fbbf17db 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h @@ -4,6 +4,8 @@ #pragma once +#include + #include "common/common_types.h" #include "video_core/hwrasterizer_base.h" -- cgit v1.2.3