From 844ebf52161147b8c7c33a65d6139602d06242ef Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 2 Jan 2026 16:12:53 -0500 Subject: [PATCH] refactor: Remove need for NetworkMonitor::getSuggestedIpAddress. Its always first if there is data --- src/lib/gui/MainWindow.cpp | 6 +++--- src/lib/gui/core/NetworkMonitor.cpp | 8 -------- src/lib/gui/core/NetworkMonitor.h | 6 ------ 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index 7947c3ca6..9469d65ae 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/src/lib/gui/MainWindow.cpp @@ -431,7 +431,7 @@ void MainWindow::startCore() // Save current IP state when server starts if (m_coreProcess.mode() == CoreMode::Server) { m_serverStartIPs = m_networkMonitor->getAvailableIPv4Addresses(); - m_serverStartSuggestedIP = m_networkMonitor->getSuggestedIPv4Address(); + m_serverStartSuggestedIP = m_serverStartIPs.isEmpty() ? "" : m_serverStartIPs.first(); } m_coreProcess.start(); @@ -1304,8 +1304,8 @@ void MainWindow::updateIpLabel(const QStringList &addresses) } } else { // Server is not running - update normally - m_currentIpAddress = m_networkMonitor->getSuggestedIPv4Address(); - labelText.append(m_currentIpAddress.isEmpty() ? m_currentIpAddress : ipList.first()); + m_currentIpAddress = ipList.first(); + labelText.append(m_currentIpAddress); } if (ipList.count() < 2) { diff --git a/src/lib/gui/core/NetworkMonitor.cpp b/src/lib/gui/core/NetworkMonitor.cpp index 7b071f692..2b8688176 100644 --- a/src/lib/gui/core/NetworkMonitor.cpp +++ b/src/lib/gui/core/NetworkMonitor.cpp @@ -117,14 +117,6 @@ QStringList NetworkMonitor::getAvailableIPv4Addresses() const return ipList; } -QString NetworkMonitor::getSuggestedIPv4Address() const -{ - const auto addresses = getAvailableIPv4Addresses(); - if (addresses.isEmpty()) - return {}; - return addresses.first(); -} - void NetworkMonitor::setIpAddresses(const QStringList &newAddresses) { if (newAddresses == m_lastAddresses) diff --git a/src/lib/gui/core/NetworkMonitor.h b/src/lib/gui/core/NetworkMonitor.h index 6f35e98d3..1994457d7 100644 --- a/src/lib/gui/core/NetworkMonitor.h +++ b/src/lib/gui/core/NetworkMonitor.h @@ -52,12 +52,6 @@ public: */ QStringList getAvailableIPv4Addresses() const; - /** - * @brief Get recommended IP address (RFC-1918 addresses preferred) - * @return Recommended IP address, returns null if none available - */ - QString getSuggestedIPv4Address() const; - Q_SIGNALS: /** * @brief Emitted when IP addresses change