From 3cd3d7b1ff5daf0a5b8555506d12d68f5d2474ff Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 11 Mar 2025 23:46:44 -0400 Subject: [PATCH] refactor: mv lib/gui/proxy/QSettingsProxy => lib/common --- src/apps/deskflow-gui/ServerConfig.cpp | 1 - src/apps/deskflow-gui/ServerConfig.h | 1 - src/lib/common/CMakeLists.txt | 2 ++ src/lib/{gui/proxy => common}/QSettingsProxy.cpp | 7 +------ src/lib/{gui/proxy => common}/QSettingsProxy.h | 4 ---- src/lib/gui/CMakeLists.txt | 2 -- src/lib/gui/config/ConfigScopes.cpp | 4 +--- src/lib/gui/config/ConfigScopes.h | 3 +-- src/lib/gui/config/IConfigScopes.h | 3 +-- src/lib/gui/config/Screen.cpp | 1 - src/lib/gui/config/Screen.h | 4 +--- src/lib/gui/config/ScreenConfig.h | 3 +-- src/test/unittests/gui/config/ConfigScopesTests.cpp | 1 - src/test/unittests/gui/config/ScreenTests.cpp | 3 +-- 14 files changed, 9 insertions(+), 30 deletions(-) rename src/lib/{gui/proxy => common}/QSettingsProxy.cpp (96%) rename src/lib/{gui/proxy => common}/QSettingsProxy.h (94%) diff --git a/src/apps/deskflow-gui/ServerConfig.cpp b/src/apps/deskflow-gui/ServerConfig.cpp index da87d034f..d5c524fa7 100644 --- a/src/apps/deskflow-gui/ServerConfig.cpp +++ b/src/apps/deskflow-gui/ServerConfig.cpp @@ -17,7 +17,6 @@ #include #include -using namespace deskflow::gui::proxy; using enum ScreenConfig::Modifier; using enum ScreenConfig::SwitchCorner; using enum ScreenConfig::Fix; diff --git a/src/apps/deskflow-gui/ServerConfig.h b/src/apps/deskflow-gui/ServerConfig.h index 27309b7c1..5ff4de6a9 100644 --- a/src/apps/deskflow-gui/ServerConfig.h +++ b/src/apps/deskflow-gui/ServerConfig.h @@ -40,7 +40,6 @@ const auto kDefaultProtocol = ServerProtocol::kBarrier; class ServerConfig : public ScreenConfig, public deskflow::gui::IServerConfig { - using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; using ServerProtocol = synergy::gui::ServerProtocol; friend class ServerConfigDialog; diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index 7b2afd024..0568aba7a 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -18,6 +18,8 @@ add_library(common STATIC stdvector.h Settings.h Settings.cpp + QSettingsProxy.cpp + QSettingsProxy.h ${CMAKE_CURRENT_BINARY_DIR}/constants.h ) diff --git a/src/lib/gui/proxy/QSettingsProxy.cpp b/src/lib/common/QSettingsProxy.cpp similarity index 96% rename from src/lib/gui/proxy/QSettingsProxy.cpp rename to src/lib/common/QSettingsProxy.cpp index 8a63f7f5b..0267db3ee 100644 --- a/src/lib/gui/proxy/QSettingsProxy.cpp +++ b/src/lib/common/QSettingsProxy.cpp @@ -7,7 +7,6 @@ #include "QSettingsProxy.h" #include "common/constants.h" -#include "gui/Logger.h" #include #include @@ -15,8 +14,6 @@ #include #include -namespace deskflow::gui::proxy { - const auto kLegacyOrgDomain = "http-symless-com"; const auto kLegacySystemConfigFilename = "SystemConfig.ini"; @@ -105,7 +102,7 @@ void migrateLegacyUserSettings(QSettings &newSettings) for (const QString &key : std::as_const(keys)) { QVariant oldValue = oldSettings.value(key); newSettings.setValue(key, oldValue); - logVerbose(QString("migrating setting '%1' = '%2'").arg(key, oldValue.toString())); + qInfo().noquote() << QStringLiteral("migrating setting '%1' = '%2'").arg(key, oldValue.toString()); } newSettings.sync(); @@ -214,5 +211,3 @@ bool QSettingsProxy::contains(const QString &key) const { return m_pSettings->contains(key); } - -} // namespace deskflow::gui::proxy diff --git a/src/lib/gui/proxy/QSettingsProxy.h b/src/lib/common/QSettingsProxy.h similarity index 94% rename from src/lib/gui/proxy/QSettingsProxy.h rename to src/lib/common/QSettingsProxy.h index 3dadaa7a6..0323c8ef9 100644 --- a/src/lib/gui/proxy/QSettingsProxy.h +++ b/src/lib/common/QSettingsProxy.h @@ -8,8 +8,6 @@ #include -namespace deskflow::gui::proxy { - QString getSystemSettingBaseDir(); class QSettingsProxy @@ -52,5 +50,3 @@ public: private: std::unique_ptr m_pSettings; }; - -} // namespace deskflow::gui::proxy diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt index 93dde13c7..e381a16f6 100644 --- a/src/lib/gui/CMakeLists.txt +++ b/src/lib/gui/CMakeLists.txt @@ -64,8 +64,6 @@ add_library(${target} STATIC proxy/QNetworkAccessManagerProxy.h proxy/QProcessProxy.cpp proxy/QProcessProxy.h - proxy/QSettingsProxy.cpp - proxy/QSettingsProxy.h tls/TlsCertificate.cpp tls/TlsCertificate.h tls/TlsUtility.cpp diff --git a/src/lib/gui/config/ConfigScopes.cpp b/src/lib/gui/config/ConfigScopes.cpp index 0d0fda7c1..b69c2b1d1 100644 --- a/src/lib/gui/config/ConfigScopes.cpp +++ b/src/lib/gui/config/ConfigScopes.cpp @@ -6,7 +6,7 @@ #include "ConfigScopes.h" -#include "proxy/QSettingsProxy.h" +#include "common/QSettingsProxy.h" #include #include @@ -17,8 +17,6 @@ namespace deskflow::gui { -using namespace proxy; - // // ConfigScopes::Deps // diff --git a/src/lib/gui/config/ConfigScopes.h b/src/lib/gui/config/ConfigScopes.h index 8bfc457f2..c891e994e 100644 --- a/src/lib/gui/config/ConfigScopes.h +++ b/src/lib/gui/config/ConfigScopes.h @@ -7,6 +7,7 @@ #pragma once #include "IConfigScopes.h" +#include "common/QSettingsProxy.h" #include #include @@ -18,8 +19,6 @@ namespace deskflow::gui { /// @brief Encapsulates Qt config for both user and global scopes. class ConfigScopes : public QObject, public IConfigScopes { - using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; - Q_OBJECT public: diff --git a/src/lib/gui/config/IConfigScopes.h b/src/lib/gui/config/IConfigScopes.h index 2906aa89e..6a0ca3ca1 100644 --- a/src/lib/gui/config/IConfigScopes.h +++ b/src/lib/gui/config/IConfigScopes.h @@ -6,7 +6,7 @@ #pragma once -#include "gui/proxy/QSettingsProxy.h" +#include "common/QSettingsProxy.h" #include #include @@ -16,7 +16,6 @@ namespace deskflow::gui { class IConfigScopes { - using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; public: enum class Scope diff --git a/src/lib/gui/config/Screen.cpp b/src/lib/gui/config/Screen.cpp index 89809fc1a..36e2be7f5 100644 --- a/src/lib/gui/config/Screen.cpp +++ b/src/lib/gui/config/Screen.cpp @@ -9,7 +9,6 @@ #include "Screen.h" #include "config/ScreenConfig.h" -using namespace deskflow::gui::proxy; using enum ScreenConfig::Modifier; using enum ScreenConfig::SwitchCorner; using enum ScreenConfig::Fix; diff --git a/src/lib/gui/config/Screen.h b/src/lib/gui/config/Screen.h index 7e33a93f4..97d92d9cc 100644 --- a/src/lib/gui/config/Screen.h +++ b/src/lib/gui/config/Screen.h @@ -10,7 +10,7 @@ #include "ScreenConfig.h" -#include "gui/proxy/QSettingsProxy.h" +#include "common/QSettingsProxy.h" #include #include @@ -24,8 +24,6 @@ class ScreenSettingsDialog; class Screen : public ScreenConfig { - using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; - friend class ScreenSettingsDialog; friend class ScreenSetupModel; friend class ScreenSetupView; diff --git a/src/lib/gui/config/ScreenConfig.h b/src/lib/gui/config/ScreenConfig.h index 8bf7ffee0..5ce4c57d1 100644 --- a/src/lib/gui/config/ScreenConfig.h +++ b/src/lib/gui/config/ScreenConfig.h @@ -10,12 +10,11 @@ #include #include -#include "gui/proxy/QSettingsProxy.h" +#include "common/QSettingsProxy.h" /// @brief Screen configuration base class class ScreenConfig { - using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; public: enum class Modifier diff --git a/src/test/unittests/gui/config/ConfigScopesTests.cpp b/src/test/unittests/gui/config/ConfigScopesTests.cpp index 0e4cb4e4c..70a6d49ab 100644 --- a/src/test/unittests/gui/config/ConfigScopesTests.cpp +++ b/src/test/unittests/gui/config/ConfigScopesTests.cpp @@ -13,7 +13,6 @@ using namespace testing; using namespace deskflow::gui; -using namespace deskflow::gui::proxy; namespace { diff --git a/src/test/unittests/gui/config/ScreenTests.cpp b/src/test/unittests/gui/config/ScreenTests.cpp index d4d154443..c305bed41 100644 --- a/src/test/unittests/gui/config/ScreenTests.cpp +++ b/src/test/unittests/gui/config/ScreenTests.cpp @@ -6,13 +6,12 @@ #include "gui/config/Screen.h" -#include "gui/proxy/QSettingsProxy.h" +#include "common/QSettingsProxy.h" #include "shared/gui/TestQtCoreApp.h" #include #include -using namespace deskflow::gui::proxy; using namespace testing; class QSettingsProxyMock : public QSettingsProxy