From 6362948e15d71b993d118d70dfed9c98cdda5566 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 9 Mar 2025 01:01:41 -0500 Subject: [PATCH] feat: CoreProcess no longer needs AppConfig --- src/apps/deskflow-gui/MainWindow.cpp | 2 +- src/lib/gui/core/CoreProcess.cpp | 6 ++---- src/lib/gui/core/CoreProcess.h | 7 +------ src/test/unittests/gui/core/CoreProcessTests.cpp | 3 +-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index 71b2a3586..644a02f0d 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -65,7 +65,7 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig) m_configScopes(configScopes), m_appConfig(appConfig), m_serverConfig(appConfig, *this), - m_coreProcess(appConfig, m_serverConfig), + m_coreProcess(m_serverConfig), m_serverConnection(this, m_serverConfig, m_serverConfigDialogState), m_clientConnection(this), m_tlsUtility(this), diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index d72fdc614..e1a27d464 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -7,7 +7,6 @@ #include "CoreProcess.h" #include "common/Settings.h" -#include "gui/config/IAppConfig.h" #include "gui/core/CoreTool.h" #include "gui/ipc/DaemonIpcClient.h" #include "gui/paths.h" @@ -150,9 +149,8 @@ QString CoreProcess::Deps::getProfileRoot() const // CoreProcess // -CoreProcess::CoreProcess(const IAppConfig &appConfig, const IServerConfig &serverConfig, std::shared_ptr deps) - : m_appConfig(appConfig), - m_serverConfig(serverConfig), +CoreProcess::CoreProcess(const IServerConfig &serverConfig, std::shared_ptr deps) + : m_serverConfig(serverConfig), m_pDeps(deps), m_daemonIpcClient{new ipc::DaemonIpcClient(this)} { diff --git a/src/lib/gui/core/CoreProcess.h b/src/lib/gui/core/CoreProcess.h index 9668676cb..e10c51e72 100644 --- a/src/lib/gui/core/CoreProcess.h +++ b/src/lib/gui/core/CoreProcess.h @@ -8,7 +8,6 @@ #include "common/Settings.h" #include "gui/FileTail.h" -#include "gui/config/IAppConfig.h" #include "gui/config/IServerConfig.h" #include "gui/proxy/QProcessProxy.h" @@ -78,10 +77,7 @@ public: Listening }; - explicit CoreProcess( - const IAppConfig &appConfig, const IServerConfig &serverConfig, - std::shared_ptr deps = std::make_shared() - ); + explicit CoreProcess(const IServerConfig &serverConfig, std::shared_ptr deps = std::make_shared()); void extracted(QString &app, QStringList &args); void start(std::optional processMode = std::nullopt); @@ -162,7 +158,6 @@ private: void checkOSXNotification(const QString &line); #endif - const IAppConfig &m_appConfig; const IServerConfig &m_serverConfig; std::shared_ptr m_pDeps; QString m_address; diff --git a/src/test/unittests/gui/core/CoreProcessTests.cpp b/src/test/unittests/gui/core/CoreProcessTests.cpp index 05cb8aed1..10422283d 100644 --- a/src/test/unittests/gui/core/CoreProcessTests.cpp +++ b/src/test/unittests/gui/core/CoreProcessTests.cpp @@ -67,14 +67,13 @@ public: class CoreProcessTests : public Test { public: - CoreProcessTests() : m_coreProcess(m_appConfig, m_serverConfig, m_pDeps) + CoreProcessTests() : m_coreProcess(m_serverConfig, m_pDeps) { Settings::setValue(Settings::Server::ExternalConfig, true); Settings::setValue(Settings::Server::ExternalConfigFile, m_configFile); Settings::setValue(Settings::Core::ProcessMode, Settings::ProcessMode::Desktop); } - NiceMock m_appConfig; NiceMock m_serverConfig; std::shared_ptr> m_pDeps = std::make_shared>(); CoreProcess m_coreProcess;