smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: CoreProcess no longer needs AppConfig

Browse source
This commit is contained in:
sithlord48 2025-03-09 01:01:41 -05:00 committed by Nick Bolton
parent 085a70d5a5
commit 6362948e15
4 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/apps/deskflow-gui/MainWindow.cpp
View file

@ -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),

6
src/lib/gui/core/CoreProcess.cpp
View file

@ -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> deps)
: m_appConfig(appConfig),
m_serverConfig(serverConfig),
CoreProcess::CoreProcess(const IServerConfig &serverConfig, std::shared_ptr<Deps> deps)
: m_serverConfig(serverConfig),
m_pDeps(deps),
m_daemonIpcClient{new ipc::DaemonIpcClient(this)}
{

7
src/lib/gui/core/CoreProcess.h
View file

@ -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> deps = std::make_shared<Deps>()
);
explicit CoreProcess(const IServerConfig &serverConfig, std::shared_ptr<Deps> deps = std::make_shared<Deps>());
void extracted(QString &app, QStringList &args);
void start(std::optional<ProcessMode> 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<Deps> m_pDeps;
QString m_address;

3
src/test/unittests/gui/core/CoreProcessTests.cpp
View file

@ -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<AppConfigMock> m_appConfig;
NiceMock<ServerConfigMock> m_serverConfig;
std::shared_ptr<NiceMock<DepsMock>> m_pDeps = std::make_shared<NiceMock<DepsMock>>();
CoreProcess m_coreProcess;