diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index 08e92b9de..ac5b8d8e3 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -59,10 +59,9 @@ using namespace deskflow::gui; using CoreConnectionState = CoreProcess::ConnectionState; using CoreProcessState = CoreProcess::ProcessState; -MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig) +MainWindow::MainWindow(ConfigScopes &configScopes) : ui{std::make_unique()}, m_configScopes(configScopes), - m_appConfig(appConfig), m_serverConfig(*this), m_coreProcess(m_serverConfig), m_serverConnection(this, m_serverConfig), diff --git a/src/apps/deskflow-gui/MainWindow.h b/src/apps/deskflow-gui/MainWindow.h index 9170ead62..a9ed4fe7b 100644 --- a/src/apps/deskflow-gui/MainWindow.h +++ b/src/apps/deskflow-gui/MainWindow.h @@ -18,7 +18,6 @@ #include "ServerConfig.h" #include "VersionChecker.h" -#include "gui/config/AppConfig.h" #include "gui/config/ConfigScopes.h" #include "gui/core/ClientConnection.h" #include "gui/core/CoreProcess.h" @@ -74,7 +73,7 @@ public: }; public: - explicit MainWindow(deskflow::gui::ConfigScopes &configScopes, AppConfig &appConfig); + explicit MainWindow(deskflow::gui::ConfigScopes &configScopes); ~MainWindow() override; CoreMode coreMode() const @@ -130,14 +129,6 @@ private: std::unique_ptr ui; void updateSize(); - AppConfig &appConfig() - { - return m_appConfig; - } - AppConfig const &appConfig() const - { - return m_appConfig; - } void createMenuBar(); void setupTrayIcon(); void applyConfig(); @@ -197,7 +188,6 @@ private: bool m_saveOnExit = true; deskflow::gui::core::WaylandWarnings m_waylandWarnings; deskflow::gui::ConfigScopes &m_configScopes; - AppConfig &m_appConfig; ServerConfig m_serverConfig; deskflow::gui::CoreProcess m_coreProcess; deskflow::gui::ServerConnection m_serverConnection; diff --git a/src/apps/deskflow-gui/main.cpp b/src/apps/deskflow-gui/main.cpp index a80633a78..fbfcf4fdf 100644 --- a/src/apps/deskflow-gui/main.cpp +++ b/src/apps/deskflow-gui/main.cpp @@ -143,9 +143,7 @@ int main(int argc, char *argv[]) diagnostic::clearSettings(configScopes, false); } - AppConfig appConfig(configScopes); - - MainWindow mainWindow(configScopes, appConfig); + MainWindow mainWindow(configScopes); mainWindow.open(); return QApplication::exec();