Misc: Post-refactor cleanups

src/duckstation-qt/achievementlogindialog.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "achievementlogindialog.h"
-#include "core/achievements_private.h"
+#include "core/achievements.h"
 #include "qthost.h"
 #include <QtWidgets/QMessageBox>
 

src/duckstation-qt/achievementsettingswidget.cpp

@@ -8,7 +8,7 @@
 #include "settingsdialog.h"
 #include "settingwidgetbinder.h"
 
-#include "core/achievements_private.h"
+#include "core/achievements.h"
 #include "core/system.h"
 
 #include "common/string_util.h"

src/duckstation-qt/audiosettingswidget.cpp

@@ -5,7 +5,6 @@
 #include "settingsdialog.h"
 #include "settingwidgetbinder.h"
 
-#include "core/common_host.h"
 #include "core/spu.h"
 
 #include "util/audio_stream.h"

src/duckstation-qt/controllerbindingwidgets.cpp

@@ -2,17 +2,21 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "controllerbindingwidgets.h"
-#include "common/log.h"
-#include "common/string_util.h"
 #include "controllersettingsdialog.h"
 #include "controllersettingwidgetbinder.h"
-#include "core/controller.h"
-#include "core/host_settings.h"
-#include "util/input_manager.h"
 #include "qthost.h"
 #include "qtutils.h"
 #include "settingsdialog.h"
 #include "settingwidgetbinder.h"
+
+#include "core/controller.h"
+#include "core/host.h"
+
+#include "util/input_manager.h"
+
+#include "common/log.h"
+#include "common/string_util.h"
+
 #include <QtWidgets/QCheckBox>
 #include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/QInputDialog>
@@ -519,7 +523,9 @@ ControllerCustomSettingsWidget::ControllerCustomSettingsWidget(ControllerBinding
   layout->addStretch(1);
 }
 
-ControllerCustomSettingsWidget::~ControllerCustomSettingsWidget() {}
+ControllerCustomSettingsWidget::~ControllerCustomSettingsWidget()
+{
+}
 
 void ControllerCustomSettingsWidget::createSettingWidgets(ControllerBindingWidget* parent, QWidget* parent_widget,
                                                           QGridLayout* layout, const Controller::ControllerInfo* cinfo)
@@ -720,9 +726,13 @@ void ControllerCustomSettingsWidget::restoreDefaults()
 
 //////////////////////////////////////////////////////////////////////////
 
-ControllerBindingWidget_Base::ControllerBindingWidget_Base(ControllerBindingWidget* parent) : QWidget(parent) {}
+ControllerBindingWidget_Base::ControllerBindingWidget_Base(ControllerBindingWidget* parent) : QWidget(parent)
+{
+}
 
-ControllerBindingWidget_Base::~ControllerBindingWidget_Base() {}
+ControllerBindingWidget_Base::~ControllerBindingWidget_Base()
+{
+}
 
 QIcon ControllerBindingWidget_Base::getIcon() const
 {
@@ -792,7 +802,9 @@ ControllerBindingWidget_DigitalController::ControllerBindingWidget_DigitalContro
   initBindingWidgets();
 }
 
-ControllerBindingWidget_DigitalController::~ControllerBindingWidget_DigitalController() {}
+ControllerBindingWidget_DigitalController::~ControllerBindingWidget_DigitalController()
+{
+}
 
 QIcon ControllerBindingWidget_DigitalController::getIcon() const
 {
@@ -813,7 +825,9 @@ ControllerBindingWidget_AnalogController::ControllerBindingWidget_AnalogControll
   initBindingWidgets();
 }
 
-ControllerBindingWidget_AnalogController::~ControllerBindingWidget_AnalogController() {}
+ControllerBindingWidget_AnalogController::~ControllerBindingWidget_AnalogController()
+{
+}
 
 QIcon ControllerBindingWidget_AnalogController::getIcon() const
 {
@@ -834,7 +848,9 @@ ControllerBindingWidget_AnalogJoystick::ControllerBindingWidget_AnalogJoystick(C
   initBindingWidgets();
 }
 
-ControllerBindingWidget_AnalogJoystick::~ControllerBindingWidget_AnalogJoystick() {}
+ControllerBindingWidget_AnalogJoystick::~ControllerBindingWidget_AnalogJoystick()
+{
+}
 
 QIcon ControllerBindingWidget_AnalogJoystick::getIcon() const
 {
@@ -872,7 +888,9 @@ ControllerBindingWidget_NeGcon::ControllerBindingWidget_NeGcon(ControllerBinding
   }
 }
 
-ControllerBindingWidget_NeGcon::~ControllerBindingWidget_NeGcon() {}
+ControllerBindingWidget_NeGcon::~ControllerBindingWidget_NeGcon()
+{
+}
 
 QIcon ControllerBindingWidget_NeGcon::getIcon() const
 {
@@ -893,7 +911,9 @@ ControllerBindingWidget_GunCon::ControllerBindingWidget_GunCon(ControllerBinding
   initBindingWidgets();
 }
 
-ControllerBindingWidget_GunCon::~ControllerBindingWidget_GunCon() {}
+ControllerBindingWidget_GunCon::~ControllerBindingWidget_GunCon()
+{
+}
 
 QIcon ControllerBindingWidget_GunCon::getIcon() const
 {
@@ -914,7 +934,9 @@ ControllerBindingWidget_Mouse::ControllerBindingWidget_Mouse(ControllerBindingWi
   initBindingWidgets();
 }
 
-ControllerBindingWidget_Mouse::~ControllerBindingWidget_Mouse() {}
+ControllerBindingWidget_Mouse::~ControllerBindingWidget_Mouse()
+{
+}
 
 QIcon ControllerBindingWidget_Mouse::getIcon() const
 {

src/duckstation-qt/controllersettingsdialog.cpp

@@ -2,16 +2,19 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "controllersettingsdialog.h"
-#include "common/assert.h"
-#include "common/file_system.h"
 #include "controllerbindingwidgets.h"
 #include "controllerglobalsettingswidget.h"
-#include "core/controller.h"
-#include "core/host_settings.h"
-#include "util/input_manager.h"
 #include "hotkeysettingswidget.h"
 #include "qthost.h"
+
+#include "core/controller.h"
+#include "core/host.h"
+
 #include "util/ini_settings_interface.h"
+#include "util/input_manager.h"
+
+#include "common/assert.h"
+#include "common/file_system.h"
 
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QMessageBox>

src/duckstation-qt/controllersettingwidgetbinder.h

@@ -1,7 +1,12 @@
+// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
+
 #pragma once
 
-#include <optional>
-#include <type_traits>
+#include "qthost.h"
+#include "settingwidgetbinder.h"
+
+#include "core/host.h"
 
 #include <QtCore/QtCore>
 #include <QtGui/QAction>
@@ -11,10 +16,8 @@
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QSlider>
 #include <QtWidgets/QSpinBox>
-
-#include "core/host_settings.h"
-#include "qthost.h"
-#include "settingwidgetbinder.h"
+#include <optional>
+#include <type_traits>
 
 /// This nastyness is required because input profiles aren't overlaid settings like the rest of them, it's
 /// input profile *or* global, not both.

src/duckstation-qt/gamelistwidget.cpp

@@ -8,7 +8,7 @@
 #include "qtutils.h"
 
 #include "core/game_list.h"
-#include "core/host_settings.h"
+#include "core/host.h"
 #include "core/settings.h"
 
 #include "common/assert.h"
@@ -83,7 +83,9 @@ private:
   QString m_filter_name;
 };
 
-GameListWidget::GameListWidget(QWidget* parent /* = nullptr */) : QWidget(parent) {}
+GameListWidget::GameListWidget(QWidget* parent /* = nullptr */) : QWidget(parent)
+{
+}
 
 GameListWidget::~GameListWidget() = default;
 
@@ -585,7 +587,9 @@ const GameList::Entry* GameListWidget::getSelectedEntry() const
   }
 }
 
-GameListGridListView::GameListGridListView(QWidget* parent /*= nullptr*/) : QListView(parent) {}
+GameListGridListView::GameListGridListView(QWidget* parent /*= nullptr*/) : QListView(parent)
+{
+}
 
 void GameListGridListView::wheelEvent(QWheelEvent* e)
 {

src/duckstation-qt/inputbindingwidgets.cpp

@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "inputbindingwidgets.h"
-#include "common/bitutils.h"
 #include "controllersettingsdialog.h"
-#include "core/host_settings.h"
 #include "inputbindingdialog.h"
 #include "qthost.h"
 #include "qtutils.h"
+
+#include "core/host.h"
+
+#include "common/bitutils.h"
+
 #include <QtCore/QTimer>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
@@ -408,7 +411,9 @@ InputVibrationBindingWidget::InputVibrationBindingWidget(QWidget* parent, Contro
   setKey(dialog, std::move(section_name), std::move(key_name));
 }
 
-InputVibrationBindingWidget::~InputVibrationBindingWidget() {}
+InputVibrationBindingWidget::~InputVibrationBindingWidget()
+{
+}
 
 void InputVibrationBindingWidget::setKey(ControllerSettingsDialog* dialog, std::string section_name,
                                          std::string key_name)

src/duckstation-qt/mainwindow.cpp

@@ -25,7 +25,6 @@
 
 #include "util/cd_image.h"
 #include "util/gpu_device.h"
-#include "util/platform_misc.h"
 
 #include "common/assert.h"
 #include "common/file_system.h"
@@ -46,15 +45,15 @@
 #include <QtWidgets/QStyleFactory>
 #include <cmath>
 
-#ifdef WITH_CHEEVOS
-#include "core/achievements_private.h"
-#endif
-
 #ifdef _WIN32
 #include "common/windows_headers.h"
 #include <Dbt.h>
 #endif
 
+#ifdef __APPLE__
+#include "util/cocoa_tools.h"
+#endif
+
 Log_SetChannel(MainWindow);
 
 static constexpr char DISC_IMAGE_FILTER[] = QT_TRANSLATE_NOOP(
@@ -65,11 +64,7 @@ static constexpr char DISC_IMAGE_FILTER[] = QT_TRANSLATE_NOOP(
   "(*.ecm);;Media Descriptor Sidecar Images (*.mds);;PlayStation EBOOTs (*.pbp *.PBP);;PlayStation Executables (*.exe "
   "*.psexe *.ps-exe);;Portable Sound Format Files (*.psf *.minipsf);;Playlists (*.m3u)");
 
-#ifdef __APPLE__
-const char* DEFAULT_THEME_NAME = "";
-#else
 const char* DEFAULT_THEME_NAME = "darkfusion";
-#endif
 
 MainWindow* g_main_window = nullptr;
 static QString s_unthemed_style_name;
@@ -123,7 +118,7 @@ MainWindow::~MainWindow()
   unregisterForDeviceNotifications();
 #endif
 #ifdef __APPLE__
-  FrontendCommon::RemoveThemeChangeHandler(this);
+  CocoaTools::RemoveThemeChangeHandler(this);
 #endif
 }
 
@@ -159,8 +154,8 @@ void MainWindow::initialize()
 #endif
 
 #ifdef __APPLE__
-  FrontendCommon::AddThemeChangeHandler(this,
-                                        [](void* ctx) { QtHost::RunOnUIThread([] { g_main_window->updateTheme(); }); });
+  CocoaTools::AddThemeChangeHandler(this,
+                                    [](void* ctx) { QtHost::RunOnUIThread([] { g_main_window->updateTheme(); }); });
 #endif
 }
 

src/duckstation-qt/postprocessingchainconfigwidget.h

@@ -13,7 +13,7 @@
 #include <optional>
 #include <string_view>
 
-namespace FrontendCommon {
+namespace PlatformMisc {
 class PostProcessingChain;
 }
 

src/duckstation-qt/qthost.cpp

@@ -7,6 +7,7 @@
 #include "qtprogresscallback.h"
 #include "qtutils.h"
 
+#include "core/achievements.h"
 #include "core/cheats.h"
 #include "core/controller.h"
 #include "core/fullscreen_ui.h"
@@ -14,7 +15,6 @@
 #include "core/game_list.h"
 #include "core/gpu.h"
 #include "core/host.h"
-#include "core/host_settings.h"
 #include "core/imgui_overlays.h"
 #include "core/memory_card.h"
 #include "core/spu.h"
@@ -32,6 +32,7 @@
 #include "util/imgui_manager.h"
 #include "util/ini_settings_interface.h"
 #include "util/input_manager.h"
+#include "util/platform_misc.h"
 
 #include "scmversion/scmversion.h"
 
@@ -62,10 +63,6 @@ Log_SetChannel(QtHost);
 #include <ShlObj.h>
 #endif
 
-#ifdef WITH_CHEEVOS
-#include "core/achievements_private.h"
-#endif
-
 static constexpr u32 SETTINGS_VERSION = 3;
 static constexpr u32 SETTINGS_SAVE_DELAY = 1000;
 
@@ -321,7 +318,6 @@ void QtHost::SetDataDirectory()
 
 void Host::LoadSettings(SettingsInterface& si, std::unique_lock<std::mutex>& lock)
 {
-  CommonHost::LoadSettings(si, lock);
   g_emu_thread->loadSettings(si);
 }
 
@@ -358,7 +354,6 @@ void EmuThread::checkForSettingsChanges(const Settings& old_settings)
 
 void Host::CheckForSettingsChanges(const Settings& old_settings)
 {
-  CommonHost::CheckForSettingsChanges(old_settings);
   g_emu_thread->checkForSettingsChanges(old_settings);
 }
 
@@ -385,15 +380,15 @@ void QtHost::SetDefaultSettings(SettingsInterface& si, bool system, bool control
   if (system)
   {
     System::SetDefaultSettings(si);
-    CommonHost::SetDefaultSettings(si);
     EmuFolders::SetDefaults();
     EmuFolders::Save(si);
   }
 
   if (controller)
   {
-    CommonHost::SetDefaultControllerSettings(si);
-    CommonHost::SetDefaultHotkeyBindings(si);
+    InputManager::SetDefaultSourceConfig(si);
+    Settings::SetDefaultControllerConfig(si);
+    Settings::SetDefaultHotkeyConfig(si);
   }
 }
 
@@ -745,15 +740,11 @@ void EmuThread::connectDisplaySignals(DisplayWidget* widget)
 
 void Host::OnSystemStarting()
 {
-  CommonHost::OnSystemStarting();
-
   emit g_emu_thread->systemStarting();
 }
 
 void Host::OnSystemStarted()
 {
-  CommonHost::OnSystemStarted();
-
   g_emu_thread->wakeThread();
   g_emu_thread->stopBackgroundControllerPollTimer();
 
@@ -762,8 +753,6 @@ void Host::OnSystemStarted()
 
 void Host::OnSystemPaused()
 {
-  CommonHost::OnSystemPaused();
-
   emit g_emu_thread->systemPaused();
   g_emu_thread->startBackgroundControllerPollTimer();
   Host::InvalidateDisplay();
@@ -771,8 +760,6 @@ void Host::OnSystemPaused()
 
 void Host::OnSystemResumed()
 {
-  CommonHost::OnSystemResumed();
-
   // if we were surfaceless (view->game list, system->unpause), get our display widget back
   if (g_emu_thread->isSurfaceless())
     g_emu_thread->setSurfaceless(false);
@@ -785,8 +772,6 @@ void Host::OnSystemResumed()
 
 void Host::OnSystemDestroyed()
 {
-  CommonHost::OnSystemDestroyed();
-
   g_emu_thread->resetPerformanceCounters();
   g_emu_thread->startBackgroundControllerPollTimer();
   emit g_emu_thread->systemDestroyed();
@@ -1227,10 +1212,9 @@ void EmuThread::saveScreenshot()
   System::SaveScreenshot(nullptr, true, true);
 }
 
-#ifdef WITH_CHEEVOS
-
 void Host::OnAchievementsRefreshed()
 {
+#ifdef WITH_CHEEVOS
   u32 game_id = 0;
   u32 achievement_count = 0;
   u32 max_points = 0;
@@ -1264,18 +1248,19 @@ void Host::OnAchievementsRefreshed()
   }
 
   emit g_emu_thread->achievementsRefreshed(game_id, game_info, achievement_count, max_points);
+#endif
 }
 
 void Host::OnAchievementsChallengeModeChanged()
 {
+#ifdef WITH_CHEEVOS
   emit g_emu_thread->achievementsChallengeModeChanged();
-}
-
 #endif
+}
 
 void EmuThread::doBackgroundControllerPoll()
 {
-  InputManager::PollSources();
+  System::Internal::IdlePollUpdate();
 }
 
 void EmuThread::createBackgroundControllerPollTimer()
@@ -1346,7 +1331,7 @@ void EmuThread::run()
   m_started_semaphore.release();
 
   // input source setup must happen on emu thread
-  CommonHost::Initialize();
+  System::Internal::ProcessStartup();
 
   // bind buttons/axises
   createBackgroundControllerPollTimer();
@@ -1370,7 +1355,7 @@ void EmuThread::run()
       }
 
       m_event_loop->processEvents(QEventLoop::AllEvents);
-      CommonHost::PumpMessagesOnCPUThread();
+      System::Internal::IdlePollUpdate();
       if (g_gpu_device)
       {
         Host::RenderDisplay(false);
@@ -1384,7 +1369,7 @@ void EmuThread::run()
     System::ShutdownSystem(false);
 
   destroyBackgroundControllerPollTimer();
-  CommonHost::Shutdown();
+  System::Internal::ProcessShutdown();
 
   // move back to UI thread
   moveToThread(m_ui_thread);
@@ -1585,8 +1570,6 @@ void Host::OnPerformanceCountersUpdated()
 
 void Host::OnGameChanged(const std::string& disc_path, const std::string& game_serial, const std::string& game_name)
 {
-  CommonHost::OnGameChanged(disc_path, game_serial, game_name);
-
   emit g_emu_thread->runningGameChanged(QString::fromStdString(disc_path), QString::fromStdString(game_serial),
                                         QString::fromStdString(game_name));
 }
@@ -1606,7 +1589,6 @@ void Host::SetMouseMode(bool relative, bool hide_cursor)
 void Host::PumpMessagesOnCPUThread()
 {
   g_emu_thread->getEventLoop()->processEvents(QEventLoop::AllEvents);
-  CommonHost::PumpMessagesOnCPUThread(); // calls InputManager::PollSources()
 }
 
 void QtHost::SaveSettings()

src/duckstation-qt/qthost.h

@@ -6,12 +6,10 @@
 #include "gdbserver.h"
 #include "qtutils.h"
 
+#include "core/game_list.h"
 #include "core/host.h"
-#include "core/host_settings.h"
 #include "core/system.h"
 #include "core/types.h"
-#include "core/common_host.h"
-#include "core/game_list.h"
 
 #include "util/gpu_device.h"
 #include "util/input_manager.h"

src/duckstation-qt/settingsdialog.cpp

@@ -20,7 +20,6 @@
 #include "qthost.h"
 
 #include "core/host.h"
-#include "core/host_settings.h"
 
 #include "util/ini_settings_interface.h"
 
@@ -32,7 +31,7 @@
 
 #ifdef WITH_CHEEVOS
 #include "achievementsettingswidget.h"
-#include "core/achievements_private.h"
+#include "core/achievements.h"
 #endif
 
 static QList<SettingsDialog*> s_open_game_properties_dialogs;

src/duckstation-qt/settingwidgetbinder.h

@@ -1,10 +1,17 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
 
-#include <optional>
-#include <type_traits>
+#include "qthost.h"
+#include "qtutils.h"
+#include "settingsdialog.h"
+
+#include "core/host.h"
+#include "core/settings.h"
+
+#include "common/assert.h"
+#include "common/path.h"
 
 #include <QtCore/QtCore>
 #include <QtGui/QAction>
@@ -17,15 +24,8 @@
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QSlider>
 #include <QtWidgets/QSpinBox>
-
-#include "common/assert.h"
-#include "common/path.h"
-#include "core/host_settings.h"
-#include "core/settings.h"
-
-#include "qthost.h"
-#include "qtutils.h"
-#include "settingsdialog.h"
+#include <optional>
+#include <type_traits>
 
 namespace SettingWidgetBinder {
 static constexpr const char* NULLABLE_PROPERTY = "SettingWidgetBinder_isNullable";