Merge branch suyu:dev into dev

.ci/scripts/format/script.sh

@@ -33,5 +33,5 @@ if [ ! -z "$DIFF" ]; then
     exit 1
 fi
 
-cd src/android
-./gradlew ktlintCheck
+#cd src/android
+#./gradlew ktlintCheck

.gitlab-ci.yml

@@ -1,6 +1,15 @@
 stages:
+  - format
   - build
 
+clang-format:
+  stage: format
+  image: suyuemu/cibuild:latest
+  variables:
+    RELEASE_NAME: mainline
+  script:
+    - bash .ci/scripts/format/script.sh
+
 build-linux:
   stage: build
   image: suyuemu/cibuild:latest

src/suyu/about_dialog.cpp

@@ -4,8 +4,8 @@
 #include <QIcon>
 #include <fmt/format.h>
 #include "common/scm_rev.h"
-#include "ui_aboutdialog.h"
 #include "suyu/about_dialog.h"
+#include "ui_aboutdialog.h"
 
 AboutDialog::AboutDialog(QWidget* parent)
     : QDialog(parent), ui{std::make_unique<Ui::AboutDialog>()} {

src/suyu/applets/qt_controller.cpp

@@ -14,7 +14,6 @@
 #include "hid_core/hid_core.h"
 #include "hid_core/hid_types.h"
 #include "hid_core/resources/npad/npad.h"
-#include "ui_qt_controller.h"
 #include "suyu/applets/qt_controller.h"
 #include "suyu/configuration/configure_input.h"
 #include "suyu/configuration/configure_input_profile_dialog.h"
@@ -23,6 +22,7 @@
 #include "suyu/configuration/input_profiles.h"
 #include "suyu/main.h"
 #include "suyu/util/controller_navigation.h"
+#include "ui_qt_controller.h"
 
 namespace {
 

src/suyu/applets/qt_software_keyboard.cpp

@@ -13,10 +13,10 @@
 #include "hid_core/frontend/input_interpreter.h"
 #include "hid_core/hid_core.h"
 #include "hid_core/hid_types.h"
-#include "ui_qt_software_keyboard.h"
 #include "suyu/applets/qt_software_keyboard.h"
 #include "suyu/main.h"
 #include "suyu/util/overlay_dialog.h"
+#include "ui_qt_software_keyboard.h"
 
 namespace {
 

src/suyu/bootmanager.cpp

@@ -54,12 +54,12 @@
 #include "input_common/drivers/tas_input.h"
 #include "input_common/drivers/touch_screen.h"
 #include "input_common/main.h"
-#include "video_core/gpu.h"
-#include "video_core/rasterizer_interface.h"
-#include "video_core/renderer_base.h"
 #include "suyu/bootmanager.h"
 #include "suyu/main.h"
 #include "suyu/qt_common.h"
+#include "video_core/gpu.h"
+#include "video_core/rasterizer_interface.h"
+#include "video_core/renderer_base.h"
 
 class QObject;
 class QPaintEngine;

src/suyu/breakpad.cpp

@@ -50,8 +50,8 @@ static void PruneDumpDirectory(const std::filesystem::path& dump_path) {
 }
 
 #if defined(__linux__)
-[[noreturn]] static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context,
-                                      bool succeeded) {
+[[noreturn]] static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
+                                      void* context, bool succeeded) {
     // Prevent time- and space-consuming core dumps from being generated, as we have
     // already generated a minidump and a core file will not be useful anyway.
     _exit(1);

src/suyu/compatdb.cpp

@@ -8,8 +8,8 @@
 #include "common/logging/log.h"
 #include "common/telemetry.h"
 #include "core/telemetry_session.h"
-#include "ui_compatdb.h"
 #include "suyu/compatdb.h"
+#include "ui_compatdb.h"
 
 CompatDB::CompatDB(Core::TelemetrySession& telemetry_session_, QWidget* parent)
     : QWizard(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),

src/suyu/configuration/configure_applets.cpp

@@ -3,10 +3,10 @@
 
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_applets.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_applets.h"
 #include "suyu/configuration/shared_widget.h"
+#include "ui_configure_applets.h"
 
 ConfigureApplets::ConfigureApplets(Core::System& system_,
                                    std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,

src/suyu/configuration/configure_audio.cpp

@@ -13,12 +13,12 @@
 #include "common/settings.h"
 #include "common/settings_common.h"
 #include "core/core.h"
-#include "ui_configure_audio.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_audio.h"
 #include "suyu/configuration/shared_translation.h"
 #include "suyu/configuration/shared_widget.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_audio.h"
 
 ConfigureAudio::ConfigureAudio(const Core::System& system_,
                                std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,

src/suyu/configuration/configure_audio.h

@@ -6,6 +6,7 @@
 #include <functional>
 #include <memory>
 #include <vector>
+#include <QPushButton>
 #include <QWidget>
 #include "suyu/configuration/configuration_shared.h"
 

src/suyu/configuration/configure_camera.cpp

@@ -13,8 +13,8 @@
 #include "common/settings.h"
 #include "input_common/drivers/camera.h"
 #include "input_common/main.h"
-#include "ui_configure_camera.h"
 #include "suyu/configuration/configure_camera.h"
+#include "ui_configure_camera.h"
 
 ConfigureCamera::ConfigureCamera(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_)
     : QDialog(parent), input_subsystem{input_subsystem_},

src/suyu/configuration/configure_cpu.cpp

@@ -10,9 +10,9 @@
 #include "common/settings_enums.h"
 #include "configuration/shared_widget.h"
 #include "core/core.h"
-#include "ui_configure_cpu.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_cpu.h"
+#include "ui_configure_cpu.h"
 
 ConfigureCpu::ConfigureCpu(const Core::System& system_,
                            std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,

src/suyu/configuration/configure_cpu_debug.cpp

@@ -3,8 +3,8 @@
 
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_cpu_debug.h"
 #include "suyu/configuration/configure_cpu_debug.h"
+#include "ui_configure_cpu_debug.h"
 
 ConfigureCpuDebug::ConfigureCpuDebug(const Core::System& system_, QWidget* parent)
     : QWidget(parent), ui{std::make_unique<Ui::ConfigureCpuDebug>()}, system{system_} {

src/suyu/configuration/configure_debug.cpp

@@ -9,10 +9,10 @@
 #include "common/logging/filter.h"
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_debug.h"
 #include "suyu/configuration/configure_debug.h"
 #include "suyu/debugger/console.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_debug.h"
 
 ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent)
     : QScrollArea(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} {

src/suyu/configuration/configure_debug_controller.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "hid_core/hid_core.h"
-#include "ui_configure_debug_controller.h"
 #include "suyu/configuration/configure_debug_controller.h"
 #include "suyu/configuration/configure_input_player.h"
+#include "ui_configure_debug_controller.h"
 
 ConfigureDebugController::ConfigureDebugController(QWidget* parent,
                                                    InputCommon::InputSubsystem* input_subsystem,

src/suyu/configuration/configure_debug_tab.cpp

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <memory>
-#include "ui_configure_debug_tab.h"
 #include "suyu/configuration/configure_cpu_debug.h"
 #include "suyu/configuration/configure_debug.h"
 #include "suyu/configuration/configure_debug_tab.h"
+#include "ui_configure_debug_tab.h"
 
 ConfigureDebugTab::ConfigureDebugTab(const Core::System& system_, QWidget* parent)
     : QWidget(parent), ui{std::make_unique<Ui::ConfigureDebugTab>()},

src/suyu/configuration/configure_dialog.cpp

@@ -6,8 +6,6 @@
 #include "common/settings.h"
 #include "common/settings_enums.h"
 #include "core/core.h"
-#include "ui_configure.h"
-#include "vk_device_info.h"
 #include "suyu/configuration/configure_applets.h"
 #include "suyu/configuration/configure_audio.h"
 #include "suyu/configuration/configure_cpu.h"
@@ -27,6 +25,8 @@
 #include "suyu/configuration/configure_web.h"
 #include "suyu/hotkeys.h"
 #include "suyu/uisettings.h"
+#include "ui_configure.h"
+#include "vk_device_info.h"
 
 ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
                                  InputCommon::InputSubsystem* input_subsystem,

src/suyu/configuration/configure_filesystem.cpp

@@ -6,9 +6,9 @@
 #include "common/fs/fs.h"
 #include "common/fs/path_util.h"
 #include "common/settings.h"
-#include "ui_configure_filesystem.h"
 #include "suyu/configuration/configure_filesystem.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_filesystem.h"
 
 ConfigureFilesystem::ConfigureFilesystem(QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureFilesystem>()) {

src/suyu/configuration/configure_general.cpp

@@ -7,11 +7,11 @@
 #include <QMessageBox>
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_general.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_general.h"
 #include "suyu/configuration/shared_widget.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_general.h"
 
 ConfigureGeneral::ConfigureGeneral(const Core::System& system_,
                                    std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,

src/suyu/configuration/configure_graphics.cpp

@@ -36,13 +36,13 @@
 #include "common/settings.h"
 #include "common/settings_enums.h"
 #include "core/core.h"
-#include "ui_configure_graphics.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_graphics.h"
 #include "suyu/configuration/shared_widget.h"
 #include "suyu/qt_common.h"
 #include "suyu/uisettings.h"
 #include "suyu/vk_device_info.h"
+#include "ui_configure_graphics.h"
 
 static const std::vector<VkPresentModeKHR> default_present_modes{VK_PRESENT_MODE_IMMEDIATE_KHR,
                                                                  VK_PRESENT_MODE_FIFO_KHR};

src/suyu/configuration/configure_graphics.h

@@ -16,8 +16,8 @@
 #include "common/common_types.h"
 #include "common/settings_enums.h"
 #include "configuration/shared_translation.h"
-#include "vk_device_info.h"
 #include "suyu/configuration/configuration_shared.h"
+#include "vk_device_info.h"
 
 class QPushButton;
 class QEvent;

src/suyu/configuration/configure_graphics_advanced.cpp

@@ -6,11 +6,11 @@
 #include <qnamespace.h>
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_graphics_advanced.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_graphics_advanced.h"
 #include "suyu/configuration/shared_translation.h"
 #include "suyu/configuration/shared_widget.h"
+#include "ui_configure_graphics_advanced.h"
 
 ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(
     const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,

src/suyu/configuration/configure_hotkeys.cpp

@@ -10,11 +10,11 @@
 #include "hid_core/hid_core.h"
 
 #include "frontend_common/config.h"
-#include "ui_configure_hotkeys.h"
 #include "suyu/configuration/configure_hotkeys.h"
 #include "suyu/hotkeys.h"
 #include "suyu/uisettings.h"
 #include "suyu/util/sequence_dialog/sequence_dialog.h"
+#include "ui_configure_hotkeys.h"
 
 constexpr int name_column = 0;
 constexpr int hotkey_column = 1;

src/suyu/configuration/configure_input.cpp

@@ -12,9 +12,6 @@
 #include "core/hle/service/sm/sm.h"
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
-#include "ui_configure_input.h"
-#include "ui_configure_input_advanced.h"
-#include "ui_configure_input_player.h"
 #include "suyu/configuration/configure_camera.h"
 #include "suyu/configuration/configure_debug_controller.h"
 #include "suyu/configuration/configure_input.h"
@@ -25,6 +22,9 @@
 #include "suyu/configuration/configure_touchscreen_advanced.h"
 #include "suyu/configuration/configure_vibration.h"
 #include "suyu/configuration/input_profiles.h"
+#include "ui_configure_input.h"
+#include "ui_configure_input_advanced.h"
+#include "ui_configure_input_player.h"
 
 namespace {
 template <typename Dialog, typename... Args>

src/suyu/configuration/configure_input_advanced.cpp

@@ -6,8 +6,8 @@
 #include "core/core.h"
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
-#include "ui_configure_input_advanced.h"
 #include "suyu/configuration/configure_input_advanced.h"
+#include "ui_configure_input_advanced.h"
 
 ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureInputAdvanced>()), hid_core{hid_core_} {

src/suyu/configuration/configure_input_per_game.cpp

@@ -6,9 +6,9 @@
 #include "frontend_common/config.h"
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
-#include "ui_configure_input_per_game.h"
 #include "suyu/configuration/configure_input_per_game.h"
 #include "suyu/configuration/input_profiles.h"
+#include "ui_configure_input_per_game.h"
 
 ConfigureInputPerGame::ConfigureInputPerGame(Core::System& system_, QtConfig* config_,
                                              QWidget* parent)

src/suyu/configuration/configure_input_per_game.h

@@ -7,9 +7,9 @@
 
 #include <QWidget>
 
-#include "ui_configure_input_per_game.h"
 #include "suyu/configuration/input_profiles.h"
 #include "suyu/configuration/qt_config.h"
+#include "ui_configure_input_per_game.h"
 
 class QComboBox;
 

src/suyu/configuration/configure_input_player.cpp

@@ -20,13 +20,13 @@
 #include "input_common/drivers/keyboard.h"
 #include "input_common/drivers/mouse.h"
 #include "input_common/main.h"
-#include "ui_configure_input_player.h"
 #include "suyu/bootmanager.h"
 #include "suyu/configuration/configure_input_player.h"
 #include "suyu/configuration/configure_input_player_widget.h"
 #include "suyu/configuration/configure_mouse_panning.h"
 #include "suyu/configuration/input_profiles.h"
 #include "suyu/util/limitable_input_dialog.h"
+#include "ui_configure_input_player.h"
 
 const std::array<std::string, ConfigureInputPlayer::ANALOG_SUB_BUTTONS_NUM>
     ConfigureInputPlayer::analog_sub_buttons{{

src/suyu/configuration/configure_input_profile_dialog.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core.h"
-#include "ui_configure_input_profile_dialog.h"
 #include "suyu/configuration/configure_input_player.h"
 #include "suyu/configuration/configure_input_profile_dialog.h"
+#include "ui_configure_input_profile_dialog.h"
 
 ConfigureInputProfileDialog::ConfigureInputProfileDialog(
     QWidget* parent, InputCommon::InputSubsystem* input_subsystem, InputProfiles* profiles,

src/suyu/configuration/configure_linux_tab.cpp

@@ -3,10 +3,10 @@
 
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_linux_tab.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_linux_tab.h"
 #include "suyu/configuration/shared_widget.h"
+#include "ui_configure_linux_tab.h"
 
 ConfigureLinuxTab::ConfigureLinuxTab(const Core::System& system_,
                                      std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,

src/suyu/configuration/configure_motion_touch.cpp

@@ -12,9 +12,9 @@
 #include "input_common/drivers/udp_client.h"
 #include "input_common/helpers/udp_protocol.h"
 #include "input_common/main.h"
-#include "ui_configure_motion_touch.h"
 #include "suyu/configuration/configure_motion_touch.h"
 #include "suyu/configuration/configure_touch_from_button.h"
+#include "ui_configure_motion_touch.h"
 
 CalibrationConfigurationDialog::CalibrationConfigurationDialog(QWidget* parent,
                                                                const std::string& host, u16 port)

src/suyu/configuration/configure_mouse_panning.cpp

@@ -5,8 +5,8 @@
 #include <QMessageBox>
 
 #include "common/settings.h"
-#include "ui_configure_mouse_panning.h"
 #include "suyu/configuration/configure_mouse_panning.h"
+#include "ui_configure_mouse_panning.h"
 
 ConfigureMousePanning::ConfigureMousePanning(QWidget* parent,
                                              InputCommon::InputSubsystem* input_subsystem_,

src/suyu/configuration/configure_network.cpp

@@ -5,8 +5,8 @@
 #include "common/settings.h"
 #include "core/core.h"
 #include "core/internal_network/network_interface.h"
-#include "ui_configure_network.h"
 #include "suyu/configuration/configure_network.h"
+#include "ui_configure_network.h"
 
 ConfigureNetwork::ConfigureNetwork(const Core::System& system_, QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()), system{system_} {

src/suyu/configuration/configure_per_game.cpp

@@ -26,7 +26,6 @@
 #include "core/file_sys/xts_archive.h"
 #include "core/loader/loader.h"
 #include "frontend_common/config.h"
-#include "ui_configure_per_game.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_audio.h"
 #include "suyu/configuration/configure_cpu.h"
@@ -40,6 +39,7 @@
 #include "suyu/uisettings.h"
 #include "suyu/util/util.h"
 #include "suyu/vk_device_info.h"
+#include "ui_configure_per_game.h"
 
 ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name,
                                    std::vector<VkDeviceInfo::Record>& vk_device_records,

src/suyu/configuration/configure_per_game.h

@@ -13,10 +13,10 @@
 #include "configuration/shared_widget.h"
 #include "core/file_sys/vfs/vfs_types.h"
 #include "frontend_common/config.h"
-#include "vk_device_info.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/qt_config.h"
 #include "suyu/configuration/shared_translation.h"
+#include "vk_device_info.h"
 
 namespace Core {
 class System;

src/suyu/configuration/configure_per_game_addons.cpp

@@ -18,10 +18,10 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/xts_archive.h"
 #include "core/loader/loader.h"
-#include "ui_configure_per_game_addons.h"
 #include "suyu/configuration/configure_input.h"
 #include "suyu/configuration/configure_per_game_addons.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_per_game_addons.h"
 
 ConfigurePerGameAddons::ConfigurePerGameAddons(Core::System& system_, QWidget* parent)
     : QWidget(parent), ui{std::make_unique<Ui::ConfigurePerGameAddons>()}, system{system_} {

src/suyu/configuration/configure_profile_manager.cpp

@@ -17,9 +17,9 @@
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/hle/service/acc/profile_manager.h"
-#include "ui_configure_profile_manager.h"
 #include "suyu/configuration/configure_profile_manager.h"
 #include "suyu/util/limitable_input_dialog.h"
+#include "ui_configure_profile_manager.h"
 
 namespace {
 // Same backup JPEG used by acc IProfile::GetImage if no jpeg found

src/suyu/configuration/configure_ringcon.cpp

@@ -14,9 +14,9 @@
 #include "input_common/drivers/keyboard.h"
 #include "input_common/drivers/mouse.h"
 #include "input_common/main.h"
-#include "ui_configure_ringcon.h"
 #include "suyu/bootmanager.h"
 #include "suyu/configuration/configure_ringcon.h"
+#include "ui_configure_ringcon.h"
 
 const std::array<std::string, ConfigureRingController::ANALOG_SUB_BUTTONS_NUM>
     ConfigureRingController::analog_sub_buttons{{

src/suyu/configuration/configure_system.cpp

@@ -16,10 +16,10 @@
 
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_system.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_system.h"
 #include "suyu/configuration/shared_widget.h"
+#include "ui_configure_system.h"
 
 constexpr std::array<u32, 7> LOCALE_BLOCKLIST{
     // pzzefezrpnkzeidfej

src/suyu/configuration/configure_tas.cpp

@@ -6,9 +6,9 @@
 #include "common/fs/fs.h"
 #include "common/fs/path_util.h"
 #include "common/settings.h"
-#include "ui_configure_tas.h"
 #include "suyu/configuration/configure_tas.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_tas.h"
 
 ConfigureTasDialog::ConfigureTasDialog(QWidget* parent)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigureTas>()) {

src/suyu/configuration/configure_touch_from_button.cpp

@@ -11,9 +11,9 @@
 #include "common/settings.h"
 #include "core/frontend/framebuffer_layout.h"
 #include "input_common/main.h"
-#include "ui_configure_touch_from_button.h"
 #include "suyu/configuration/configure_touch_from_button.h"
 #include "suyu/configuration/configure_touch_widget.h"
+#include "ui_configure_touch_from_button.h"
 
 static QString GetKeyName(int key_code) {
     switch (key_code) {

src/suyu/configuration/configure_touchscreen_advanced.cpp

@@ -3,8 +3,8 @@
 
 #include <memory>
 #include "common/settings.h"
-#include "ui_configure_touchscreen_advanced.h"
 #include "suyu/configuration/configure_touchscreen_advanced.h"
+#include "ui_configure_touchscreen_advanced.h"
 
 ConfigureTouchscreenAdvanced::ConfigureTouchscreenAdvanced(QWidget* parent)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigureTouchscreenAdvanced>()) {

src/suyu/configuration/configure_ui.cpp

@@ -26,8 +26,8 @@
 #include "common/settings_enums.h"
 #include "core/core.h"
 #include "core/frontend/framebuffer_layout.h"
-#include "ui_configure_ui.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_ui.h"
 
 namespace {
 constexpr std::array default_game_icon_sizes{

src/suyu/configuration/configure_vibration.cpp

@@ -5,8 +5,8 @@
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
 #include "hid_core/hid_types.h"
-#include "ui_configure_vibration.h"
 #include "suyu/configuration/configure_vibration.h"
+#include "ui_configure_vibration.h"
 
 ConfigureVibration::ConfigureVibration(QWidget* parent, Core::HID::HIDCore& hid_core_)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigureVibration>()), hid_core{hid_core_} {

src/suyu/configuration/configure_web.cpp

@@ -6,9 +6,9 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/settings.h"
 #include "core/telemetry_session.h"
-#include "ui_configure_web.h"
 #include "suyu/configuration/configure_web.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_web.h"
 
 static constexpr char token_delimiter{':'};
 

src/suyu/game_list.cpp

@@ -3,7 +3,6 @@
 
 // Modified by palfaiate on <2024/03/07>
 
-
 #include <regex>
 #include <QApplication>
 #include <QDir>

src/suyu/game_list.h

@@ -3,7 +3,6 @@
 
 // Modified by palfaiate on <2024/03/07>
 
-
 #pragma once
 
 #include <QFileSystemWatcher>
@@ -19,9 +18,9 @@
 
 #include "common/common_types.h"
 #include "core/core.h"
-#include "uisettings.h"
 #include "suyu/compatibility_list.h"
 #include "suyu/play_time_manager.h"
+#include "uisettings.h"
 
 namespace Core {
 class System;

src/suyu/loading_screen.cpp

@@ -13,9 +13,9 @@
 #include <QStyleOption>
 #include "core/frontend/framebuffer_layout.h"
 #include "core/loader/loader.h"
+#include "suyu/loading_screen.h"
 #include "ui_loading_screen.h"
 #include "video_core/rasterizer_interface.h"
-#include "suyu/loading_screen.h"
 
 // Mingw seems to not have QMovie at all. If QMovie is missing then use a single frame instead of an
 // showing the full animation

src/suyu/main.cpp

@@ -124,11 +124,6 @@
 #include "input_common/drivers/tas_input.h"
 #include "input_common/drivers/virtual_amiibo.h"
 #include "input_common/main.h"
-#include "ui_main.h"
-#include "util/overlay_dialog.h"
-#include "video_core/gpu.h"
-#include "video_core/renderer_base.h"
-#include "video_core/shader_notify.h"
 #include "suyu/about_dialog.h"
 #include "suyu/bootmanager.h"
 #include "suyu/compatdb.h"
@@ -152,6 +147,11 @@
 #include "suyu/uisettings.h"
 #include "suyu/util/clickable_label.h"
 #include "suyu/vk_device_info.h"
+#include "ui_main.h"
+#include "util/overlay_dialog.h"
+#include "video_core/gpu.h"
+#include "video_core/renderer_base.h"
+#include "video_core/shader_notify.h"
 
 #ifdef SUYU_CRASH_DUMPS
 #include "suyu/breakpad.h"

src/suyu/multiplayer/chat_room.cpp

@@ -17,10 +17,10 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/logging/log.h"
 #include "network/announce_multiplayer_session.h"
-#include "ui_chat_room.h"
 #include "suyu/game_list_p.h"
 #include "suyu/multiplayer/chat_room.h"
 #include "suyu/multiplayer/message.h"
+#include "ui_chat_room.h"
 #ifdef ENABLE_WEB_SERVICE
 #include "web_service/web_backend.h"
 #endif

src/suyu/multiplayer/client_room.cpp

@@ -11,12 +11,12 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/logging/log.h"
 #include "network/announce_multiplayer_session.h"
-#include "ui_client_room.h"
 #include "suyu/game_list_p.h"
 #include "suyu/multiplayer/client_room.h"
 #include "suyu/multiplayer/message.h"
 #include "suyu/multiplayer/moderation_dialog.h"
 #include "suyu/multiplayer/state.h"
+#include "ui_client_room.h"
 
 ClientRoomWindow::ClientRoomWindow(QWidget* parent, Network::RoomNetwork& room_network_)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),

src/suyu/multiplayer/direct_connect.cpp

@@ -11,7 +11,6 @@
 #include "core/core.h"
 #include "core/internal_network/network_interface.h"
 #include "network/network.h"
-#include "ui_direct_connect.h"
 #include "suyu/main.h"
 #include "suyu/multiplayer/client_room.h"
 #include "suyu/multiplayer/direct_connect.h"
@@ -19,6 +18,7 @@
 #include "suyu/multiplayer/state.h"
 #include "suyu/multiplayer/validation.h"
 #include "suyu/uisettings.h"
+#include "ui_direct_connect.h"
 
 enum class ConnectionType : u8 { TraversalServer, IP };
 

src/suyu/multiplayer/host_room.cpp

@@ -15,7 +15,6 @@
 #include "core/core.h"
 #include "core/internal_network/network_interface.h"
 #include "network/announce_multiplayer_session.h"
-#include "ui_host_room.h"
 #include "suyu/game_list_p.h"
 #include "suyu/main.h"
 #include "suyu/multiplayer/host_room.h"
@@ -23,6 +22,7 @@
 #include "suyu/multiplayer/state.h"
 #include "suyu/multiplayer/validation.h"
 #include "suyu/uisettings.h"
+#include "ui_host_room.h"
 #ifdef ENABLE_WEB_SERVICE
 #include "web_service/verify_user_jwt.h"
 #endif

src/suyu/multiplayer/lobby.cpp

@@ -10,7 +10,6 @@
 #include "core/hle/service/acc/profile_manager.h"
 #include "core/internal_network/network_interface.h"
 #include "network/network.h"
-#include "ui_lobby.h"
 #include "suyu/game_list_p.h"
 #include "suyu/main.h"
 #include "suyu/multiplayer/client_room.h"
@@ -20,6 +19,7 @@
 #include "suyu/multiplayer/state.h"
 #include "suyu/multiplayer/validation.h"
 #include "suyu/uisettings.h"
+#include "ui_lobby.h"
 #ifdef ENABLE_WEB_SERVICE
 #include "web_service/web_backend.h"
 #endif

src/suyu/multiplayer/moderation_dialog.cpp

@@ -5,8 +5,8 @@
 #include <QStandardItemModel>
 #include "network/network.h"
 #include "network/room_member.h"
-#include "ui_moderation_dialog.h"
 #include "suyu/multiplayer/moderation_dialog.h"
+#include "ui_moderation_dialog.h"
 
 namespace Column {
 enum {

src/suyu/startup_checks.cpp

@@ -17,9 +17,9 @@
 #endif
 
 #include <fmt/core.h>
+#include "suyu/startup_checks.h"
 #include "video_core/vulkan_common/vulkan_instance.h"
 #include "video_core/vulkan_common/vulkan_library.h"
-#include "suyu/startup_checks.h"
 
 void CheckVulkan() {
     // Just start the Vulkan loader, this will crash if something is wrong

src/suyu/util/overlay_dialog.cpp

@@ -8,8 +8,8 @@
 #include "core/core.h"
 #include "hid_core/frontend/input_interpreter.h"
 #include "hid_core/hid_types.h"
-#include "ui_overlay_dialog.h"
 #include "suyu/util/overlay_dialog.h"
+#include "ui_overlay_dialog.h"
 
 namespace {
 

src/suyu/vk_device_info.cpp

@@ -8,13 +8,13 @@
 
 #include "common/dynamic_library.h"
 #include "common/logging/log.h"
+#include "suyu/vk_device_info.h"
 #include "video_core/vulkan_common/vulkan_device.h"
 #include "video_core/vulkan_common/vulkan_instance.h"
 #include "video_core/vulkan_common/vulkan_library.h"
 #include "video_core/vulkan_common/vulkan_surface.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"
 #include "vulkan/vulkan_core.h"
-#include "suyu/vk_device_info.h"
 
 class QWindow;
 

src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp

@@ -16,8 +16,8 @@
 #include "common/string_util.h"
 #include "core/core.h"
 #include "input_common/main.h"
-#include "video_core/renderer_base.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_gl.h"
+#include "video_core/renderer_base.h"
 
 class SDLGLContext : public Core::Frontend::GraphicsContext {
 public:

src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp

@@ -9,8 +9,8 @@
 
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
-#include "video_core/renderer_null/renderer_null.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_null.h"
+#include "video_core/renderer_null/renderer_null.h"
 
 #ifdef SUYU_USE_EXTERNAL_SDL2
 // Include this before SDL.h to prevent the external from including a dummy

src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp

@@ -9,8 +9,8 @@
 
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
-#include "video_core/renderer_vulkan/renderer_vulkan.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_vk.h"
+#include "video_core/renderer_vulkan/renderer_vulkan.h"
 
 #include <SDL.h>
 #include <SDL_syswm.h>

src/suyu_cmd/suyu.cpp

@@ -34,11 +34,11 @@
 #include "input_common/main.h"
 #include "network/network.h"
 #include "sdl_config.h"
-#include "video_core/renderer_base.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_gl.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_null.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_vk.h"
+#include "video_core/renderer_base.h"
 
 #ifdef _WIN32
 // windows.h needs to be included before shellapi.h