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

chore: remove unused appconfig from mainwindow

Browse source
This commit is contained in:
sithlord48 2025-03-14 22:38:16 -04:00 committed by Nick Bolton
parent 531b988dd1
commit 9e74100960
3 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,10 +59,9 @@ using namespace deskflow::gui;
using CoreConnectionState = CoreProcess::ConnectionState; using CoreConnectionState = CoreProcess::ConnectionState;
using CoreProcessState = CoreProcess::ProcessState; using CoreProcessState = CoreProcess::ProcessState;
MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig) MainWindow::MainWindow(ConfigScopes &configScopes)
: ui{std::make_unique<Ui::MainWindow>()}, : ui{std::make_unique<Ui::MainWindow>()},
m_configScopes(configScopes), m_configScopes(configScopes),
m_appConfig(appConfig),
m_serverConfig(*this), m_serverConfig(*this),
m_coreProcess(m_serverConfig), m_coreProcess(m_serverConfig),
m_serverConnection(this, m_serverConfig), m_serverConnection(this, m_serverConfig),

12
src/apps/deskflow-gui/MainWindow.h
View file

@ -18,7 +18,6 @@
#include "ServerConfig.h" #include "ServerConfig.h"
#include "VersionChecker.h" #include "VersionChecker.h"
#include "gui/config/AppConfig.h"
#include "gui/config/ConfigScopes.h" #include "gui/config/ConfigScopes.h"
#include "gui/core/ClientConnection.h" #include "gui/core/ClientConnection.h"
#include "gui/core/CoreProcess.h" #include "gui/core/CoreProcess.h"
@ -74,7 +73,7 @@ public:
}; };
public: public:
explicit MainWindow(deskflow::gui::ConfigScopes &configScopes, AppConfig &appConfig); explicit MainWindow(deskflow::gui::ConfigScopes &configScopes);
~MainWindow() override; ~MainWindow() override;
CoreMode coreMode() const CoreMode coreMode() const
@ -130,14 +129,6 @@ private:
std::unique_ptr<Ui::MainWindow> ui; std::unique_ptr<Ui::MainWindow> ui;
void updateSize(); void updateSize();
AppConfig &appConfig()
{
return m_appConfig;
}
AppConfig const &appConfig() const
{
return m_appConfig;
}
void createMenuBar(); void createMenuBar();
void setupTrayIcon(); void setupTrayIcon();
void applyConfig(); void applyConfig();
@ -197,7 +188,6 @@ private:
bool m_saveOnExit = true; bool m_saveOnExit = true;
deskflow::gui::core::WaylandWarnings m_waylandWarnings; deskflow::gui::core::WaylandWarnings m_waylandWarnings;
deskflow::gui::ConfigScopes &m_configScopes; deskflow::gui::ConfigScopes &m_configScopes;
AppConfig &m_appConfig;
ServerConfig m_serverConfig; ServerConfig m_serverConfig;
deskflow::gui::CoreProcess m_coreProcess; deskflow::gui::CoreProcess m_coreProcess;
deskflow::gui::ServerConnection m_serverConnection; deskflow::gui::ServerConnection m_serverConnection;

4
src/apps/deskflow-gui/main.cpp
View file

@ -143,9 +143,7 @@ int main(int argc, char *argv[])
diagnostic::clearSettings(configScopes, false); diagnostic::clearSettings(configScopes, false);
} }
AppConfig appConfig(configScopes); MainWindow mainWindow(configScopes);
MainWindow mainWindow(configScopes, appConfig);
mainWindow.open(); mainWindow.open();
return QApplication::exec(); return QApplication::exec();