From 7c06ae39effe99d4eee471d1b44d23ce3bfc45d1 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 30 Jul 2025 19:36:28 -0400 Subject: [PATCH] refactor: AddResults => enum class ScreenAddResults --- src/lib/gui/MainWindow.cpp | 2 +- src/lib/gui/ServerConfig.cpp | 3 ++- src/lib/gui/ServerConfig.h | 18 +++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index 71b987008..1f12ad9db 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/src/lib/gui/MainWindow.cpp @@ -1037,7 +1037,7 @@ void MainWindow::autoAddScreen(const QString &name) if (name.isEmpty()) return; - if (m_serverConfig.autoAddScreen(name) == AutoAddScreenManualClient) { + if (m_serverConfig.autoAddScreen(name) == ScreenAddResults::AutoAddScreenManualClient) { showConfigureServer( tr("Please add the client (%1) to the grid.").arg(Settings::value(Settings::Core::ScreenName).toString()) ); diff --git a/src/lib/gui/ServerConfig.cpp b/src/lib/gui/ServerConfig.cpp index 80abb54aa..0e6f16ab1 100644 --- a/src/lib/gui/ServerConfig.cpp +++ b/src/lib/gui/ServerConfig.cpp @@ -321,9 +321,10 @@ int ServerConfig::numScreens() const return rval; } -int ServerConfig::autoAddScreen(const QString name) +ScreenAddResults ServerConfig::autoAddScreen(const QString name) { using enum AddAction; + using enum ScreenAddResults; int serverIndex = -1; int targetIndex = -1; diff --git a/src/lib/gui/ServerConfig.h b/src/lib/gui/ServerConfig.h index 2c6f2c7fe..89ea0d18f 100644 --- a/src/lib/gui/ServerConfig.h +++ b/src/lib/gui/ServerConfig.h @@ -37,6 +37,14 @@ const auto kDefaultProtocol = ServerProtocol::kBarrier; } // namespace deskflow::gui +enum class ScreenAddResults +{ + AutoAddScreenOk, + AutoAddScreenManualServer, + AutoAddScreenManualClient, + AutoAddScreenIgnore +}; + class ServerConfig : public ScreenConfig, public deskflow::gui::IServerConfig { using ServerProtocol = deskflow::gui::ServerProtocol; @@ -148,7 +156,7 @@ public: // void commit(); int numScreens() const; - int autoAddScreen(const QString name); + ScreenAddResults autoAddScreen(const QString name); const QString getServerName() const; void updateServerName(); const QString configFile() const; @@ -275,11 +283,3 @@ private: }; QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config); - -enum AddResults -{ - AutoAddScreenOk, - AutoAddScreenManualServer, - AutoAddScreenManualClient, - AutoAddScreenIgnore -};