diff options
Diffstat (limited to '')
47 files changed, 50 insertions, 133 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 53d035b32..0abae86c3 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -9,16 +9,13 @@ #endif #include "citra_qt/bootmanager.h" - #include "common/key_map.h" #include "common/microprofile.h" #include "common/scm_rev.h" #include "common/string_util.h" - #include "core/core.h" #include "core/settings.h" #include "core/system.h" - #include "video_core/debug_utils/debug_utils.h" #include "video_core/video_core.h" diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index 59241684d..67228b94f 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -5,10 +5,8 @@ #include <atomic> #include <condition_variable> #include <mutex> - #include <QGLWidget> #include <QThread> - #include "common/emu_window.h" #include "common/thread.h" diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index d25bdcf9f..e3648572f 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -2,11 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <QSettings> - #include "citra_qt/config.h" +#include <QSettings> #include "citra_qt/ui_settings.h" - #include "common/file_util.h" Config::Config() { diff --git a/src/citra_qt/config.h b/src/citra_qt/config.h index db76fa870..79c901804 100644 --- a/src/citra_qt/config.h +++ b/src/citra_qt/config.h @@ -4,9 +4,8 @@ #pragma once -#include <QVariant> #include <string> - +#include <QVariant> #include "core/settings.h" class QSettings; diff --git a/src/citra_qt/configure_audio.cpp b/src/citra_qt/configure_audio.cpp index 944047d05..ba976252e 100644 --- a/src/citra_qt/configure_audio.cpp +++ b/src/citra_qt/configure_audio.cpp @@ -2,12 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "audio_core/sink_details.h" - #include "citra_qt/configure_audio.h" -#include "ui_configure_audio.h" - +#include "audio_core/sink_details.h" #include "core/settings.h" +#include "ui_configure_audio.h" ConfigureAudio::ConfigureAudio(QWidget* parent) : QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()) { diff --git a/src/citra_qt/configure_audio.h b/src/citra_qt/configure_audio.h index e836910aa..51df2e27b 100644 --- a/src/citra_qt/configure_audio.h +++ b/src/citra_qt/configure_audio.h @@ -4,8 +4,8 @@ #pragma once -#include <QWidget> #include <memory> +#include <QWidget> namespace Ui { class ConfigureAudio; diff --git a/src/citra_qt/configure_debug.cpp b/src/citra_qt/configure_debug.cpp index dde8d670e..dcc398eee 100644 --- a/src/citra_qt/configure_debug.cpp +++ b/src/citra_qt/configure_debug.cpp @@ -3,9 +3,8 @@ // Refer to the license.txt file included. #include "citra_qt/configure_debug.h" -#include "ui_configure_debug.h" - #include "core/settings.h" +#include "ui_configure_debug.h" ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureDebug) { ui->setupUi(this); diff --git a/src/citra_qt/configure_debug.h b/src/citra_qt/configure_debug.h index e9c6960e2..d167eb996 100644 --- a/src/citra_qt/configure_debug.h +++ b/src/citra_qt/configure_debug.h @@ -4,8 +4,8 @@ #pragma once -#include <QWidget> #include <memory> +#include <QWidget> namespace Ui { class ConfigureDebug; diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp index c33c95540..d6a4e8af1 100644 --- a/src/citra_qt/configure_dialog.cpp +++ b/src/citra_qt/configure_dialog.cpp @@ -4,9 +4,8 @@ #include "citra_qt/configure_dialog.h" #include "citra_qt/config.h" -#include "ui_configure.h" - #include "core/settings.h" +#include "ui_configure.h" ConfigureDialog::ConfigureDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ConfigureDialog) { ui->setupUi(this); diff --git a/src/citra_qt/configure_dialog.h b/src/citra_qt/configure_dialog.h index e4e450691..21fa1f501 100644 --- a/src/citra_qt/configure_dialog.h +++ b/src/citra_qt/configure_dialog.h @@ -4,8 +4,8 @@ #pragma once -#include <QDialog> #include <memory> +#include <QDialog> namespace Ui { class ConfigureDialog; diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp index 3e6f76bfe..27139fb30 100644 --- a/src/citra_qt/configure_general.cpp +++ b/src/citra_qt/configure_general.cpp @@ -4,10 +4,9 @@ #include "citra_qt/configure_general.h" #include "citra_qt/ui_settings.h" -#include "ui_configure_general.h" - #include "core/settings.h" #include "core/system.h" +#include "ui_configure_general.h" ConfigureGeneral::ConfigureGeneral(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureGeneral) { diff --git a/src/citra_qt/configure_general.h b/src/citra_qt/configure_general.h index 196474ae3..447552d8c 100644 --- a/src/citra_qt/configure_general.h +++ b/src/citra_qt/configure_general.h @@ -4,8 +4,8 @@ #pragma once -#include <QWidget> #include <memory> +#include <QWidget> namespace Ui { class ConfigureGeneral; diff --git a/src/citra_qt/configure_graphics.cpp b/src/citra_qt/configure_graphics.cpp index bde6727cc..19c1f75c2 100644 --- a/src/citra_qt/configure_graphics.cpp +++ b/src/citra_qt/configure_graphics.cpp @@ -3,10 +3,9 @@ // Refer to the license.txt file included. #include "citra_qt/configure_graphics.h" -#include "ui_configure_graphics.h" - #include "core/settings.h" #include "core/system.h" +#include "ui_configure_graphics.h" ConfigureGraphics::ConfigureGraphics(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureGraphics) { diff --git a/src/citra_qt/configure_graphics.h b/src/citra_qt/configure_graphics.h index 906d534a6..5497a55f7 100644 --- a/src/citra_qt/configure_graphics.h +++ b/src/citra_qt/configure_graphics.h @@ -4,8 +4,8 @@ #pragma once -#include <QWidget> #include <memory> +#include <QWidget> namespace Ui { class ConfigureGraphics; diff --git a/src/citra_qt/configure_input.cpp b/src/citra_qt/configure_input.cpp index 7900134ca..7039301e3 100644 --- a/src/citra_qt/configure_input.cpp +++ b/src/citra_qt/configure_input.cpp @@ -2,11 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <QTimer> +#include "citra_qt/configure_input.h" #include <memory> #include <utility> - -#include "citra_qt/configure_input.h" +#include <QTimer> ConfigureInput::ConfigureInput(QWidget* parent) : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) { diff --git a/src/citra_qt/configure_input.h b/src/citra_qt/configure_input.h index 5d9624bb0..5183b904d 100644 --- a/src/citra_qt/configure_input.h +++ b/src/citra_qt/configure_input.h @@ -4,9 +4,9 @@ #pragma once +#include <memory> #include <QKeyEvent> #include <QWidget> - #include "citra_qt/config.h" #include "core/settings.h" #include "ui_configure_input.h" diff --git a/src/citra_qt/configure_system.cpp b/src/citra_qt/configure_system.cpp index 732e15dda..873d314ec 100644 --- a/src/citra_qt/configure_system.cpp +++ b/src/citra_qt/configure_system.cpp @@ -4,11 +4,10 @@ #include "citra_qt/configure_system.h" #include "citra_qt/ui_settings.h" -#include "ui_configure_system.h" - #include "core/hle/service/cfg/cfg.h" #include "core/hle/service/fs/archive.h" #include "core/system.h" +#include "ui_configure_system.h" static const std::array<int, 12> days_in_month = {{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, diff --git a/src/citra_qt/configure_system.h b/src/citra_qt/configure_system.h index 3a0754bb5..db0ead13c 100644 --- a/src/citra_qt/configure_system.h +++ b/src/citra_qt/configure_system.h @@ -4,8 +4,8 @@ #pragma once -#include <QWidget> #include <memory> +#include <QWidget> namespace Ui { class ConfigureSystem; diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index db266b506..14bd1c77c 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -2,13 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <QStandardItemModel> - #include "citra_qt/debugger/callstack.h" - +#include <QStandardItemModel> #include "common/common_types.h" #include "common/symbols.h" - #include "core/arm/arm_interface.h" #include "core/arm/disassembler/arm_disasm.h" #include "core/core.h" diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 803e8b172..7a5d3e2f1 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -2,16 +2,13 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/debugger/disassembler.h" #include <QShortcut> - #include "citra_qt/bootmanager.h" -#include "citra_qt/debugger/disassembler.h" #include "citra_qt/hotkeys.h" #include "citra_qt/util/util.h" - #include "common/break_points.h" #include "common/symbols.h" - #include "core/arm/arm_interface.h" #include "core/arm/disassembler/arm_disasm.h" #include "core/core.h" diff --git a/src/citra_qt/debugger/disassembler.h b/src/citra_qt/debugger/disassembler.h index 1f5607788..2ca6c2bd4 100644 --- a/src/citra_qt/debugger/disassembler.h +++ b/src/citra_qt/debugger/disassembler.h @@ -6,11 +6,9 @@ #include <QAbstractListModel> #include <QDockWidget> - -#include "ui_disassembler.h" - #include "common/break_points.h" #include "common/common_types.h" +#include "ui_disassembler.h" class QAction; class EmuThread; diff --git a/src/citra_qt/debugger/graphics.cpp b/src/citra_qt/debugger/graphics.cpp index b79c063db..31b54e855 100644 --- a/src/citra_qt/debugger/graphics.cpp +++ b/src/citra_qt/debugger/graphics.cpp @@ -2,9 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <QListView> - #include "citra_qt/debugger/graphics.h" +#include <QListView> #include "citra_qt/util/util.h" extern GraphicsDebugger g_debugger; diff --git a/src/citra_qt/debugger/graphics.h b/src/citra_qt/debugger/graphics.h index 7d681b97d..bedf3e596 100644 --- a/src/citra_qt/debugger/graphics.h +++ b/src/citra_qt/debugger/graphics.h @@ -6,7 +6,6 @@ #include <QAbstractListModel> #include <QDockWidget> - #include "video_core/gpu_debugger.h" class GPUCommandStreamItemModel : public QAbstractListModel, diff --git a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp b/src/citra_qt/debugger/graphics_breakpoint_observer.cpp index 25a398ece..ad11552d7 100644 --- a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp +++ b/src/citra_qt/debugger/graphics_breakpoint_observer.cpp @@ -2,9 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <QMetaType> - #include "citra_qt/debugger/graphics_breakpoint_observer.h" +#include <QMetaType> BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context, const QString& title, QWidget* parent) diff --git a/src/citra_qt/debugger/graphics_breakpoint_observer.h b/src/citra_qt/debugger/graphics_breakpoint_observer.h index 8d0871f27..e77df4f5b 100644 --- a/src/citra_qt/debugger/graphics_breakpoint_observer.h +++ b/src/citra_qt/debugger/graphics_breakpoint_observer.h @@ -5,7 +5,6 @@ #pragma once #include <QDockWidget> - #include "video_core/debug_utils/debug_utils.h" /** diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp index b31eba533..e1d1b4911 100644 --- a/src/citra_qt/debugger/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics_breakpoints.cpp @@ -2,15 +2,13 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/debugger/graphics_breakpoints.h" #include <QLabel> #include <QMetaType> #include <QPushButton> #include <QTreeView> #include <QVBoxLayout> - -#include "citra_qt/debugger/graphics_breakpoints.h" #include "citra_qt/debugger/graphics_breakpoints_p.h" - #include "common/assert.h" BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent) diff --git a/src/citra_qt/debugger/graphics_breakpoints.h b/src/citra_qt/debugger/graphics_breakpoints.h index 2371b0e39..5fc40c916 100644 --- a/src/citra_qt/debugger/graphics_breakpoints.h +++ b/src/citra_qt/debugger/graphics_breakpoints.h @@ -5,9 +5,7 @@ #pragma once #include <memory> - #include <QDockWidget> - #include "video_core/debug_utils/debug_utils.h" class QLabel; diff --git a/src/citra_qt/debugger/graphics_breakpoints_p.h b/src/citra_qt/debugger/graphics_breakpoints_p.h index 5f321ede2..dc64706bd 100644 --- a/src/citra_qt/debugger/graphics_breakpoints_p.h +++ b/src/citra_qt/debugger/graphics_breakpoints_p.h @@ -5,9 +5,7 @@ #pragma once #include <memory> - #include <QAbstractListModel> - #include "video_core/debug_utils/debug_utils.h" class BreakPointModel : public QAbstractListModel { diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp index b088ad29d..35be9b9bd 100644 --- a/src/citra_qt/debugger/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics_cmdlists.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/debugger/graphics_cmdlists.h" #include <QApplication> #include <QClipboard> #include <QComboBox> @@ -13,13 +14,9 @@ #include <QSpinBox> #include <QTreeView> #include <QVBoxLayout> - -#include "citra_qt/debugger/graphics_cmdlists.h" #include "citra_qt/util/spinbox.h" #include "citra_qt/util/util.h" - #include "common/vector_math.h" - #include "video_core/debug_utils/debug_utils.h" #include "video_core/pica.h" #include "video_core/pica_state.h" diff --git a/src/citra_qt/debugger/graphics_cmdlists.h b/src/citra_qt/debugger/graphics_cmdlists.h index b2242eca4..fa2b9122b 100644 --- a/src/citra_qt/debugger/graphics_cmdlists.h +++ b/src/citra_qt/debugger/graphics_cmdlists.h @@ -6,7 +6,6 @@ #include <QAbstractListModel> #include <QDockWidget> - #include "video_core/debug_utils/debug_utils.h" #include "video_core/gpu_debugger.h" diff --git a/src/citra_qt/debugger/graphics_surface.cpp b/src/citra_qt/debugger/graphics_surface.cpp index bb998acc4..496fce59d 100644 --- a/src/citra_qt/debugger/graphics_surface.cpp +++ b/src/citra_qt/debugger/graphics_surface.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/debugger/graphics_surface.h" #include <QBoxLayout> #include <QComboBox> #include <QDebug> @@ -11,15 +12,10 @@ #include <QPushButton> #include <QScrollArea> #include <QSpinBox> - -#include "citra_qt/debugger/graphics_surface.h" #include "citra_qt/util/spinbox.h" - #include "common/color.h" - #include "core/hw/gpu.h" #include "core/memory.h" - #include "video_core/pica.h" #include "video_core/pica_state.h" #include "video_core/utils.h" diff --git a/src/citra_qt/debugger/graphics_surface.h b/src/citra_qt/debugger/graphics_surface.h index 5881ae60a..21e6b5b8b 100644 --- a/src/citra_qt/debugger/graphics_surface.h +++ b/src/citra_qt/debugger/graphics_surface.h @@ -4,10 +4,9 @@ #pragma once -#include "citra_qt/debugger/graphics_breakpoint_observer.h" - #include <QLabel> #include <QPushButton> +#include "citra_qt/debugger/graphics_breakpoint_observer.h" class QComboBox; class QSpinBox; diff --git a/src/citra_qt/debugger/graphics_tracing.cpp b/src/citra_qt/debugger/graphics_tracing.cpp index b6f638b60..944150b8e 100644 --- a/src/citra_qt/debugger/graphics_tracing.cpp +++ b/src/citra_qt/debugger/graphics_tracing.cpp @@ -2,29 +2,22 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/debugger/graphics_tracing.h" #include <algorithm> #include <array> #include <iterator> #include <memory> - -#include <boost/range/algorithm/copy.hpp> - #include <QBoxLayout> #include <QComboBox> #include <QFileDialog> #include <QMessageBox> #include <QPushButton> - -#include "citra_qt/debugger/graphics_tracing.h" - +#include <boost/range/algorithm/copy.hpp> #include "common/common_types.h" - #include "core/hw/gpu.h" #include "core/hw/lcd.h" #include "core/tracer/recorder.h" - #include "nihstro/float24.h" - #include "video_core/pica.h" #include "video_core/pica_state.h" diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index 0f02bc3da..3b3ffe5c6 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/debugger/graphics_vertex_shader.h" #include <iomanip> #include <sstream> - #include <QBoxLayout> #include <QFileDialog> #include <QFormLayout> @@ -15,10 +15,7 @@ #include <QSignalMapper> #include <QSpinBox> #include <QTreeView> - -#include "citra_qt/debugger/graphics_vertex_shader.h" #include "citra_qt/util/util.h" - #include "video_core/pica.h" #include "video_core/pica_state.h" #include "video_core/shader/shader.h" diff --git a/src/citra_qt/debugger/graphics_vertex_shader.h b/src/citra_qt/debugger/graphics_vertex_shader.h index 96692d82c..ec42f24bb 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.h +++ b/src/citra_qt/debugger/graphics_vertex_shader.h @@ -5,11 +5,9 @@ #pragma once #include <QAbstractTableModel> - +#include <QTreeView> #include "citra_qt/debugger/graphics_breakpoint_observer.h" - #include "nihstro/parser_shbin.h" - #include "video_core/shader/shader.h" class QLabel; diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index 97a377513..39d2d6e39 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp @@ -2,13 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/debugger/profiler.h" #include <QMouseEvent> #include <QPainter> #include <QString> - -#include "citra_qt/debugger/profiler.h" #include "citra_qt/util/util.h" - #include "common/common_types.h" #include "common/microprofile.h" #include "common/profiler_reporting.h" diff --git a/src/citra_qt/debugger/profiler.h b/src/citra_qt/debugger/profiler.h index d0a90fdee..d8c6487aa 100644 --- a/src/citra_qt/debugger/profiler.h +++ b/src/citra_qt/debugger/profiler.h @@ -7,11 +7,9 @@ #include <QAbstractItemModel> #include <QDockWidget> #include <QTimer> - -#include "ui_profiler.h" - #include "common/microprofile.h" #include "common/profiler_reporting.h" +#include "ui_profiler.h" class ProfilerModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 87c8c3418..13842dac3 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp @@ -2,11 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <QTreeWidgetItem> - #include "citra_qt/debugger/registers.h" +#include <QTreeWidgetItem> #include "citra_qt/util/util.h" - #include "core/arm/arm_interface.h" #include "core/core.h" diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h index cba601731..54c9a8155 100644 --- a/src/citra_qt/debugger/registers.h +++ b/src/citra_qt/debugger/registers.h @@ -2,9 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "ui_registers.h" - #include <QDockWidget> +#include "ui_registers.h" class QTreeWidget; class QTreeWidgetItem; diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 9f9c22a44..16d31be77 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -2,19 +2,16 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "game_list.h" #include <QHeaderView> #include <QThreadPool> #include <QVBoxLayout> - -#include "game_list.h" -#include "game_list_p.h" -#include "ui_settings.h" - -#include "core/loader/loader.h" - #include "common/common_paths.h" #include "common/logging/log.h" #include "common/string_util.h" +#include "core/loader/loader.h" +#include "game_list_p.h" +#include "ui_settings.h" GameList::GameList(QWidget* parent) { QVBoxLayout* layout = new QVBoxLayout; diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h index c8a9ee5db..60ab4cf02 100644 --- a/src/citra_qt/game_list_p.h +++ b/src/citra_qt/game_list_p.h @@ -5,18 +5,14 @@ #pragma once #include <atomic> - #include <QImage> #include <QRunnable> #include <QStandardItem> #include <QString> - #include "citra_qt/util/util.h" #include "common/color.h" #include "common/string_util.h" - #include "core/loader/smdh.h" - #include "video_core/utils.h" /** diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index 3e38223ee..9037f20f2 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp @@ -2,13 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/hotkeys.h" #include <map> - #include <QKeySequence> #include <QShortcut> #include <QtGlobal> - -#include "citra_qt/hotkeys.h" #include "citra_qt/ui_settings.h" struct Hotkey { 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 @@ #include <clocale> #include <memory> #include <thread> - #include <glad/glad.h> - #define QT_NO_OPENGL #include <QDesktopWidget> #include <QFileDialog> #include <QMessageBox> #include <QtGui> -#include "qhexedit.h" - #include "citra_qt/bootmanager.h" #include "citra_qt/config.h" #include "citra_qt/configure_dialog.h" -#include "citra_qt/game_list.h" -#include "citra_qt/hotkeys.h" -#include "citra_qt/main.h" -#include "citra_qt/ui_settings.h" - -// Debugger #include "citra_qt/debugger/callstack.h" #include "citra_qt/debugger/disassembler.h" #include "citra_qt/debugger/graphics.h" @@ -35,7 +25,10 @@ #include "citra_qt/debugger/profiler.h" #include "citra_qt/debugger/ramview.h" #include "citra_qt/debugger/registers.h" - +#include "citra_qt/game_list.h" +#include "citra_qt/hotkeys.h" +#include "citra_qt/main.h" +#include "citra_qt/ui_settings.h" #include "common/logging/backend.h" #include "common/logging/filter.h" #include "common/logging/log.h" @@ -45,14 +38,13 @@ #include "common/scm_rev.h" #include "common/scope_exit.h" #include "common/string_util.h" - #include "core/arm/disassembler/load_symbol_map.h" #include "core/core.h" #include "core/gdbstub/gdbstub.h" #include "core/loader/loader.h" #include "core/settings.h" #include "core/system.h" - +#include "qhexedit.h" #include "video_core/video_core.h" GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h index 10157310e..c4349513f 100644 --- a/src/citra_qt/main.h +++ b/src/citra_qt/main.h @@ -5,9 +5,8 @@ #ifndef _CITRA_QT_MAIN_HXX_ #define _CITRA_QT_MAIN_HXX_ -#include <QMainWindow> #include <memory> - +#include <QMainWindow> #include "ui_main.h" class Config; diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/ui_settings.h index 30f031831..ed7fdff7e 100644 --- a/src/citra_qt/ui_settings.h +++ b/src/citra_qt/ui_settings.h @@ -4,12 +4,11 @@ #pragma once +#include <vector> #include <QByteArray> #include <QString> #include <QStringList> -#include <vector> - namespace UISettings { using ContextualShortcut = std::pair<QString, int>; diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp index 5868f3b91..0bda21502 100644 --- a/src/citra_qt/util/spinbox.cpp +++ b/src/citra_qt/util/spinbox.cpp @@ -28,11 +28,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "citra_qt/util/spinbox.h" +#include <cstdlib> #include <QLineEdit> #include <QRegExpValidator> -#include <cstdlib> - -#include "citra_qt/util/spinbox.h" #include "common/assert.h" CSpinBox::CSpinBox(QWidget* parent) diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp index bf44d78ff..e77d3796c 100644 --- a/src/citra_qt/util/util.cpp +++ b/src/citra_qt/util/util.cpp @@ -2,11 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "citra_qt/util/util.h" #include <array> #include <cmath> -#include "citra_qt/util/util.h" - QFont GetMonospaceFont() { QFont font("monospace"); // Automatic fallback to a monospace font on on platforms without a font called "monospace" |