From 690d6a67ef4769a47b2b146c9d10a574a454ac86 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 16 Feb 2026 14:11:32 -0500 Subject: [PATCH] refactor: SettingsDialog, no longer need coreProccess in the settings dialog --- src/lib/gui/MainWindow.cpp | 2 +- src/lib/gui/dialogs/SettingsDialog.cpp | 7 +++---- src/lib/gui/dialogs/SettingsDialog.h | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index 91dff167e..c8810c1c1 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/src/lib/gui/MainWindow.cpp @@ -499,7 +499,7 @@ void MainWindow::openGetNewVersionUrl() const void MainWindow::openSettings() { - auto dialog = SettingsDialog(this, m_serverConfig, m_coreProcess); + auto dialog = SettingsDialog(this, m_serverConfig); if (dialog.exec() == QDialog::Accepted) { Settings::save(); diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp index 5c0514b0c..534f299c0 100644 --- a/src/lib/gui/dialogs/SettingsDialog.cpp +++ b/src/lib/gui/dialogs/SettingsDialog.cpp @@ -23,11 +23,10 @@ using namespace deskflow::gui; -SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfig, const CoreProcess &coreProcess) +SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfig) : QDialog(parent), ui{std::make_unique()}, - m_serverConfig(serverConfig), - m_coreProcess(coreProcess) + m_serverConfig(serverConfig) { ui->setupUi(this); @@ -269,7 +268,7 @@ void SettingsDialog::updateTlsControlsEnabled() bool SettingsDialog::isClientMode() const { - return m_coreProcess.mode() == Settings::CoreMode::Client; + return Settings::value(Settings::Core::CoreMode) == Settings::CoreMode::Client; } void SettingsDialog::updateKeyLengthOnFile(const QString &path) diff --git a/src/lib/gui/dialogs/SettingsDialog.h b/src/lib/gui/dialogs/SettingsDialog.h index c1495c184..4e81da8d9 100644 --- a/src/lib/gui/dialogs/SettingsDialog.h +++ b/src/lib/gui/dialogs/SettingsDialog.h @@ -10,7 +10,6 @@ #include #include "gui/config/IServerConfig.h" -#include "gui/core/CoreProcess.h" namespace Ui { class SettingsDialog; @@ -19,13 +18,12 @@ class SettingsDialog; class SettingsDialog : public QDialog { using IServerConfig = deskflow::gui::IServerConfig; - using CoreProcess = deskflow::gui::CoreProcess; Q_OBJECT public: void extracted(); - SettingsDialog(QWidget *parent, const IServerConfig &serverConfig, const CoreProcess &coreProcess); + SettingsDialog(QWidget *parent, const IServerConfig &serverConfig); ~SettingsDialog() override; Q_SIGNALS: @@ -65,5 +63,4 @@ private: std::unique_ptr ui; const IServerConfig &m_serverConfig; - const CoreProcess &m_coreProcess; };