From 941339305733707fb2173c60d1d8677d3cece1d3 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 8 Jul 2025 16:15:21 -0400 Subject: [PATCH] refactor: anonymous enum in ServerConfig => ServerConfig::AddResults enum class --- src/lib/gui/MainWindow.cpp | 2 +- src/lib/gui/ServerConfig.cpp | 12 ++++++------ src/lib/gui/ServerConfig.h | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index f10683b58..a4638d0f9 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/src/lib/gui/MainWindow.cpp @@ -1026,7 +1026,7 @@ void MainWindow::autoAddScreen(const QString &name) if (name.isEmpty()) return; - if (m_serverConfig.autoAddScreen(name) == kAutoAddScreenManualClient) { + if (m_serverConfig.autoAddScreen(name) == 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 7a7b93a78..3cec3ed9f 100644 --- a/src/lib/gui/ServerConfig.cpp +++ b/src/lib/gui/ServerConfig.cpp @@ -330,23 +330,23 @@ int ServerConfig::autoAddScreen(const QString name) int targetIndex = -1; const auto screenName = Settings::value(Settings::Core::ScreenName).toString(); if (!findScreenName(screenName, serverIndex) && !fixNoServer(screenName, serverIndex)) { - return kAutoAddScreenManualServer; + return AutoAddScreenManualServer; } if (findScreenName(name, targetIndex)) { qDebug("ignoring screen already in config: %s", qPrintable(name)); - return kAutoAddScreenIgnore; + return AutoAddScreenIgnore; } auto result = static_cast(showAddClientDialog(name)); if (result == AddClientIgnore) { - return kAutoAddScreenIgnore; + return AutoAddScreenIgnore; } if (result == AddClientOther) { addToFirstEmptyGrid(name); - return kAutoAddScreenManualClient; + return AutoAddScreenManualClient; } bool success = false; @@ -379,10 +379,10 @@ int ServerConfig::autoAddScreen(const QString name) if (!success) { addToFirstEmptyGrid(name); - return kAutoAddScreenManualClient; + return AutoAddScreenManualClient; } - return kAutoAddScreenOk; + return AutoAddScreenOk; } const QString ServerConfig::getServerName() const diff --git a/src/lib/gui/ServerConfig.h b/src/lib/gui/ServerConfig.h index 441baadb1..2c6f2c7fe 100644 --- a/src/lib/gui/ServerConfig.h +++ b/src/lib/gui/ServerConfig.h @@ -276,10 +276,10 @@ private: QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config); -enum +enum AddResults { - kAutoAddScreenOk, - kAutoAddScreenManualServer, - kAutoAddScreenManualClient, - kAutoAddScreenIgnore + AutoAddScreenOk, + AutoAddScreenManualServer, + AutoAddScreenManualClient, + AutoAddScreenIgnore };