Skip to content

Commit

Permalink
Misc: Slim down some header includes
Browse files Browse the repository at this point in the history
  • Loading branch information
stenzek committed Aug 4, 2024
1 parent 143acca commit a2f9854
Show file tree
Hide file tree
Showing 58 changed files with 142 additions and 113 deletions.
51 changes: 46 additions & 5 deletions data/resources/gamedb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30721,6 +30721,9 @@ SLES-02495:
linkCable: false
SCPS-10003:
name: "Crime Crackers (Japan)"
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
settings:
Expand Down Expand Up @@ -31038,10 +31041,16 @@ SLUS-00530:
linkCable: false
SLED-02119:
name: "Croc 2 (Europe) (Demo)"
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
traits:
- ForcePGXPCPUMode
SLES-02088:
name: "Croc 2 (Europe) (En,Fr,De,Es,It,Nl,Sv)"
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- AnalogController
- DigitalController
Expand Down Expand Up @@ -56420,6 +56429,9 @@ SCES-00867:
- SCES-00867
- SCES-10867
- SCES-20867
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56449,6 +56461,9 @@ SCES-10867:
- SCES-00867
- SCES-10867
- SCES-20867
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56478,6 +56493,9 @@ SCES-20867:
- SCES-00867
- SCES-10867
- SCES-20867
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56507,6 +56525,9 @@ SCES-00868:
- SCES-00868
- SCES-10868
- SCES-20868
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56536,6 +56557,9 @@ SCES-10868:
- SCES-00868
- SCES-10868
- SCES-20868
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56565,6 +56589,9 @@ SCES-20868:
- SCES-00868
- SCES-10868
- SCES-20868
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56594,6 +56621,9 @@ SCES-00869:
- SCES-00869
- SCES-10869
- SCES-20869
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56623,6 +56653,9 @@ SCES-10869:
- SCES-00869
- SCES-10869
- SCES-20869
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56652,6 +56685,9 @@ SCES-20869:
- SCES-00869
- SCES-10869
- SCES-20869
compatibility:
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56711,6 +56747,9 @@ SLPS-00701:
- SLPS-00700
- SLPS-00701
- SLPS-00702
compatibility:
rating: NoIssues
versionTested: "0.1-841-g777809b"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -56738,6 +56777,9 @@ SLPS-00702:
- SLPS-00700
- SLPS-00701
- SLPS-00702
compatibility:
rating: NoIssues
versionTested: "0.1-841-g777809b"
controllers:
- DigitalController
traits:
Expand Down Expand Up @@ -58208,9 +58250,8 @@ SCES-03884:
SLPS-00148:
name: "Firemen 2, The - Pete & Danny (Japan)"
compatibility:
rating: GraphicalAudioIssues
versionTested: "0.1-4693-gbbcf1c67"
comments: "Dialogue in certain cutscenes ends too early or is missing entirely (Issue #575)"
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- DigitalController
codes:
Expand Down Expand Up @@ -71234,8 +71275,8 @@ SLUS-00830:
SLUS-01244:
name: "High Heat Major League Baseball 2002 (USA)"
compatibility:
rating: GraphicalAudioIssues
versionTested: "0.1-4693-gbbcf1c67"
rating: NoIssues
versionTested: "0.1-7272-g143acca03"
controllers:
- AnalogController
- DigitalController
Expand Down
2 changes: 1 addition & 1 deletion src/core/achievements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "common/scoped_guard.h"
#include "common/small_string.h"
#include "common/string_util.h"
#include "common/timer.h"

#include "util/cd_image.h"
#include "util/http_downloader.h"
Expand All @@ -39,7 +40,6 @@
#include "fmt/format.h"
#include "imgui.h"
#include "imgui_internal.h"
#include "imgui_stdlib.h"
#include "rc_client.h"

#include <algorithm>
Expand Down
5 changes: 3 additions & 2 deletions src/core/analog_controller.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <[email protected]> and contributors.
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <[email protected]> and contributors.
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)

#pragma once

#include "controller.h"

#include <array>
#include <memory>
#include <optional>
#include <string_view>

class AnalogController final : public Controller
{
Expand Down
2 changes: 0 additions & 2 deletions src/core/analog_joystick.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#include "IconsFontAwesome5.h"
#include "IconsPromptFont.h"

#include <cmath>

Log_SetChannel(AnalogJoystick);

AnalogJoystick::AnalogJoystick(u32 index) : Controller(index)
Expand Down
5 changes: 3 additions & 2 deletions src/core/analog_joystick.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <[email protected]> and contributors.
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <[email protected]> and contributors.
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)

#pragma once

#include "controller.h"

#include <array>
#include <memory>
#include <optional>
#include <string_view>

class AnalogJoystick final : public Controller
{
Expand Down
2 changes: 0 additions & 2 deletions src/core/bios.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
#include "common/md5_digest.h"
#include "common/path.h"

#include <cerrno>

Log_SetChannel(BIOS);

namespace BIOS {
Expand Down
1 change: 1 addition & 0 deletions src/core/cdrom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "settings.h"
#include "spu.h"
#include "system.h"
#include "timing_event.h"

#include "util/cd_image.h"
#include "util/imgui_manager.h"
Expand Down
4 changes: 2 additions & 2 deletions src/core/cheats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
#include "cheats.h"
#include "bus.h"
#include "controller.h"
#include "cpu_code_cache.h"
#include "cpu_core.h"
#include "host.h"
#include "system.h"

#include "common/assert.h"
#include "common/file_system.h"
#include "common/log.h"
#include "common/small_string.h"
Expand All @@ -19,7 +17,9 @@
#include <iomanip>
#include <sstream>
#include <type_traits>

Log_SetChannel(Cheats);

static std::array<u32, 256> cht_register; // Used for D7 ,51 & 52 cheat types

using KeyValuePairVector = std::vector<std::pair<std::string, std::string>>;
Expand Down
5 changes: 4 additions & 1 deletion src/core/cheats.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <[email protected]> and contributors.
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <[email protected]> and contributors.
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)

#pragma once

#include "common/bitfield.h"

#include "types.h"

#include <optional>
#include <string>
#include <vector>
Expand Down
2 changes: 2 additions & 0 deletions src/core/cpu_code_cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "system.h"
#include "timing_event.h"

#include "util/page_fault_handler.h"

#include "common/assert.h"
#include "common/error.h"
#include "common/intrin.h"
Expand Down
5 changes: 0 additions & 5 deletions src/core/cpu_code_cache_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,8 @@
#include "cpu_core_private.h"
#include "cpu_types.h"

#include "util/page_fault_handler.h"

#include <array>
#include <map>
#include <memory>
#include <unordered_map>
#include <vector>

namespace CPU::CodeCache {

Expand Down
7 changes: 3 additions & 4 deletions src/core/cpu_recompiler_code_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)

#pragma once
#include <array>
#include <initializer_list>
#include <utility>
#include <vector>

#include "cpu_code_cache_private.h"
#include "cpu_recompiler_register_cache.h"
#include "cpu_recompiler_thunks.h"
#include "cpu_recompiler_types.h"
#include "cpu_types.h"

#include <array>
#include <utility>

namespace CPU::Recompiler {

enum class Condition : u8
Expand Down
6 changes: 3 additions & 3 deletions src/core/digital_controller.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <[email protected]> and contributors.
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <[email protected]> and contributors.
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)

#pragma once

#include "controller.h"

#include <memory>
#include <optional>
#include <string_view>

class DigitalController final : public Controller
{
Expand Down
1 change: 0 additions & 1 deletion src/core/dma.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "dma.h"
#include "bus.h"
#include "cdrom.h"
#include "cpu_code_cache.h"
#include "cpu_core.h"
#include "gpu.h"
#include "host.h"
Expand Down
7 changes: 1 addition & 6 deletions src/core/fullscreen_ui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@
#include "bios.h"
#include "cheats.h"
#include "controller.h"
#include "core/memory_card_image.h"
#include "cpu_core.h"
#include "game_list.h"
#include "gpu.h"
#include "host.h"
#include "resources.h"
#include "settings.h"
#include "system.h"

Expand All @@ -33,15 +30,13 @@
#include "common/path.h"
#include "common/small_string.h"
#include "common/string_util.h"
#include "common/threading.h"
#include "common/timer.h"

#include "IconsFontAwesome5.h"
#include "IconsPromptFont.h"
#include "fmt/chrono.h"
#include "fmt/format.h"
#include "imgui.h"
#include "imgui_internal.h"
#include "imgui_stdlib.h"

#include <atomic>
#include <bitset>
Expand Down
1 change: 0 additions & 1 deletion src/core/fullscreen_ui.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <[email protected]>
// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <[email protected]>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)

#pragma once
Expand Down
3 changes: 1 addition & 2 deletions src/core/game_list.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "util/image.h"
#include "util/ini_settings_interface.h"

#include "common/assert.h"
#include "common/binary_reader_writer.h"
#include "common/error.h"
#include "common/file_system.h"
Expand All @@ -24,10 +23,10 @@
#include "common/path.h"
#include "common/progress_callback.h"
#include "common/string_util.h"
#include "common/timer.h"

#include <algorithm>
#include <array>
#include <cctype>
#include <ctime>
#include <string_view>
#include <type_traits>
Expand Down
Loading

0 comments on commit a2f9854

Please sign in to comment.