From 5a7284fd6a0db98b1e1380ecbd8b88e4b1096070 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Tue, 11 Mar 2025 18:49:41 -0400
Subject: [PATCH] refactor: appconfig is no longer a iAppConfig subclass

---
 src/apps/deskflow-gui/MainWindow.cpp          |  1 +
 src/lib/gui/CMakeLists.txt                    |  1 -
 src/lib/gui/config/AppConfig.cpp              |  7 ----
 src/lib/gui/config/AppConfig.h                | 19 +++-------
 src/lib/gui/config/IAppConfig.h               | 37 -------------------
 .../unittests/gui/core/CoreProcessTests.cpp   |  1 -
 6 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 src/lib/gui/config/IAppConfig.h

diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index 85574b7e1..c087f0131 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -20,6 +20,7 @@
 #include "gui/config/ConfigScopes.h"
 #include "gui/constants.h"
 #include "gui/core/CoreProcess.h"
+#include "gui/core/CoreTool.h"
 #include "gui/diagnostic.h"
 #include "gui/ipc/DaemonIpcClient.h"
 #include "gui/messages.h"
diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index 3b6a841cf..93dde13c7 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/src/lib/gui/CMakeLists.txt
@@ -36,7 +36,6 @@ add_library(${target} STATIC
   config/AppConfig.h
   config/ConfigScopes.cpp
   config/ConfigScopes.h
-  config/IAppConfig.h
   config/IConfigScopes.h
   config/IServerConfig.h
   config/Screen.cpp
diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp
index 6d67e67c6..6716e3221 100644
--- a/src/lib/gui/config/AppConfig.cpp
+++ b/src/lib/gui/config/AppConfig.cpp
@@ -12,13 +12,6 @@
 
 #include "ConfigScopes.h"
 
-#include <QApplication>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QVariant>
-
-#include <functional>
-
 using namespace deskflow::gui;
 
 AppConfig::AppConfig(deskflow::gui::IConfigScopes &scopes, std::shared_ptr<Deps> deps) : m_Scopes(scopes), m_pDeps(deps)
diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h
index 62c012e76..31e47131e 100644
--- a/src/lib/gui/config/AppConfig.h
+++ b/src/lib/gui/config/AppConfig.h
@@ -8,18 +8,9 @@
 
 #pragma once
 
-#include "IAppConfig.h"
 #include "IConfigScopes.h"
 #include "common/constants.h"
-#include "gui/paths.h"
-
-#include <QDir>
 #include <QObject>
-#include <QPoint>
-#include <QSize>
-#include <QString>
-#include <QVariant>
-#include <optional>
 
 /**
  * @brief Simply reads and writes app settings.
@@ -29,7 +20,7 @@
  * instance is widely accessible, but that has previously led to this class
  * becoming a god object.
  */
-class AppConfig : public QObject, public deskflow::gui::IAppConfig
+class AppConfig : public QObject
 {
   Q_OBJECT
   using IConfigScopes = deskflow::gui::IConfigScopes;
@@ -44,16 +35,16 @@ public:
 
   void determineScope();
 
-  IConfigScopes &scopes() const override;
-  bool isActiveScopeWritable() const override;
-  bool isActiveScopeSystem() const override;
+  IConfigScopes &scopes() const;
+  bool isActiveScopeWritable() const;
+  bool isActiveScopeSystem() const;
 
   /// @brief Sets the user preference to load from SystemScope.
   /// @param [in] value
   ///             True - This will set the variable and load the global scope
   ///             settings. False - This will set the variable and load the user
   ///             scope settings.
-  void setLoadFromSystemScope(bool value) override;
+  void setLoadFromSystemScope(bool value);
 
 private:
   /// @brief This method loads config from specified scope
diff --git a/src/lib/gui/config/IAppConfig.h b/src/lib/gui/config/IAppConfig.h
deleted file mode 100644
index 7da400244..000000000
--- a/src/lib/gui/config/IAppConfig.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2024 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include "gui/config/IConfigScopes.h"
-
-#include <QString>
-
-namespace deskflow::gui {
-
-class IAppConfig
-{
-  using IConfigScopes = deskflow::gui::IConfigScopes;
-
-public:
-  virtual ~IAppConfig() = default;
-
-  //
-  // Getters
-  //
-
-  virtual IConfigScopes &scopes() const = 0;
-  virtual bool isActiveScopeSystem() const = 0;
-  virtual bool isActiveScopeWritable() const = 0;
-
-  //
-  // Setters
-  //
-
-  virtual void setLoadFromSystemScope(bool loadFromSystemScope) = 0;
-};
-
-} // namespace deskflow::gui
diff --git a/src/test/unittests/gui/core/CoreProcessTests.cpp b/src/test/unittests/gui/core/CoreProcessTests.cpp
index 734c1355c..3575ec32d 100644
--- a/src/test/unittests/gui/core/CoreProcessTests.cpp
+++ b/src/test/unittests/gui/core/CoreProcessTests.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "common/Settings.h"
-#include "gui/config/IAppConfig.h"
 #include "gui/core/CoreProcess.h"
 #include "gui/proxy/QProcessProxy.h"
 #include "shared/gui/mocks/ServerConfigMock.h"