Reorganization of includes (#348)

* Reorganization of includes

* fix
This commit is contained in:
Xphalnos 2024-07-31 12:25:55 +02:00 committed by GitHub
parent a7c9bfa5c5
commit a7f2f09a44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 14 additions and 19 deletions

View File

@ -4,8 +4,8 @@
#include <SDL3/SDL_audio.h> #include <SDL3/SDL_audio.h>
#include <SDL3/SDL_init.h> #include <SDL3/SDL_init.h>
#include <SDL3/SDL_timer.h> #include <SDL3/SDL_timer.h>
#include <common/assert.h> #include "common/assert.h"
#include <core/libraries/error_codes.h> #include "core/libraries/error_codes.h"
#include "sdl_audio.h" #include "sdl_audio.h"
namespace Audio { namespace Audio {

View File

@ -1,14 +1,8 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <core/file_format/playgo_chunk.h> #include <fmt/core.h>
#include <core/file_format/psf.h>
#include <core/file_format/splash.h>
#include <core/libraries/disc_map/disc_map.h>
#include <core/libraries/libc/libc.h>
#include <core/libraries/libc_internal/libc_internal.h>
#include <core/libraries/rtc/rtc.h>
#include <core/libraries/videoout/video_out.h>
#include "common/config.h" #include "common/config.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/logging/backend.h" #include "common/logging/backend.h"
@ -18,6 +12,7 @@
#include "common/polyfill_thread.h" #include "common/polyfill_thread.h"
#include "common/singleton.h" #include "common/singleton.h"
#include "common/version.h" #include "common/version.h"
#include "core/file_format/playgo_chunk.h"
#include "core/file_format/psf.h" #include "core/file_format/psf.h"
#include "core/file_format/splash.h" #include "core/file_format/splash.h"
#include "core/file_sys/fs.h" #include "core/file_sys/fs.h"
@ -27,13 +22,12 @@
#include "core/libraries/libc_internal/libc_internal.h" #include "core/libraries/libc_internal/libc_internal.h"
#include "core/libraries/libs.h" #include "core/libraries/libs.h"
#include "core/libraries/rtc/rtc.h" #include "core/libraries/rtc/rtc.h"
#include "core/libraries/videoout/video_out.h"
#include "core/linker.h" #include "core/linker.h"
#include "core/memory.h" #include "core/memory.h"
#include "emulator.h" #include "emulator.h"
#include "video_core/renderdoc.h" #include "video_core/renderdoc.h"
#include <fmt/core.h>
Frontend::WindowSDL* g_window = nullptr; Frontend::WindowSDL* g_window = nullptr;
namespace Core { namespace Core {

View File

@ -6,7 +6,7 @@
#include <filesystem> #include <filesystem>
#include <thread> #include <thread>
#include <common/singleton.h> #include "common/singleton.h"
#include "core/linker.h" #include "core/linker.h"
#include "input/controller.h" #include "input/controller.h"
#include "sdl_window.h" #include "sdl_window.h"

View File

@ -4,6 +4,7 @@
#include "core/libraries/kernel/time_management.h" #include "core/libraries/kernel/time_management.h"
#include "core/libraries/pad/pad.h" #include "core/libraries/pad/pad.h"
#include "input/controller.h" #include "input/controller.h"
namespace Input { namespace Input {
GameController::GameController() { GameController::GameController() {

View File

@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <emulator.h>
#include <fmt/core.h> #include <fmt/core.h>
#include "emulator.h"
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
if (argc == 1) { if (argc == 1) {

View File

@ -3,6 +3,7 @@
#include <QHeaderView> #include <QHeaderView>
#include "elf_viewer.h" #include "elf_viewer.h"
ElfViewer::ElfViewer(QWidget* parent) : QTableWidget(parent) { ElfViewer::ElfViewer(QWidget* parent) : QTableWidget(parent) {
dir_list_std = Config::getElfViewer(); dir_list_std = Config::getElfViewer();
for (const auto& str : dir_list_std) { for (const auto& str : dir_list_std) {

View File

@ -14,8 +14,8 @@
#include <QTreeView> #include <QTreeView>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include "core/loader/elf.h"
#include "game_list_frame.h" #include "game_list_frame.h"
#include "src/core/loader/elf.h"
class ElfViewer : public QTableWidget { class ElfViewer : public QTableWidget {
Q_OBJECT Q_OBJECT

View File

@ -2,15 +2,14 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <fmt/core.h>
#include "common/config.h" #include "common/config.h"
#include "core/file_sys/fs.h" #include "core/file_sys/fs.h"
#include "emulator.h"
#include "qt_gui/game_install_dialog.h" #include "qt_gui/game_install_dialog.h"
#include "qt_gui/main_window.h" #include "qt_gui/main_window.h"
#include <emulator.h>
#include <fmt/core.h>
// Custom message handler to ignore Qt logs // Custom message handler to ignore Qt logs
void customMessageHandler(QtMsgType, const QMessageLogContext&, const QString&) {} void customMessageHandler(QtMsgType, const QMessageLogContext&, const QString&) {}

View File

@ -9,13 +9,13 @@
#include <QMainWindow> #include <QMainWindow>
#include <QMimeData> #include <QMimeData>
#include <QScopedPointer> #include <QScopedPointer>
#include <emulator.h>
#include <fmt/core.h> #include <fmt/core.h>
#include "common/config.h" #include "common/config.h"
#include "common/path_util.h" #include "common/path_util.h"
#include "core/file_format/psf.h" #include "core/file_format/psf.h"
#include "core/file_sys/fs.h" #include "core/file_sys/fs.h"
#include "elf_viewer.h" #include "elf_viewer.h"
#include "emulator.h"
#include "game_grid_frame.h" #include "game_grid_frame.h"
#include "game_info.h" #include "game_info.h"
#include "game_list_frame.h" #include "game_list_frame.h"