From aa2accf5a6b437a79fd7d4b6171493654f75faaa Mon Sep 17 00:00:00 2001 From: jerry Date: Tue, 26 Aug 2014 11:27:17 +0000 Subject: [PATCH] issue #65 - Auto config feature using Zeroconf/Bonjour [no-build] renamed tryFixNoServer to fixNoServer --- src/gui/src/ServerConfig.cpp | 4 ++-- src/gui/src/ServerConfig.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp index 12819c1a..04174b3b 100644 --- a/src/gui/src/ServerConfig.cpp +++ b/src/gui/src/ServerConfig.cpp @@ -272,7 +272,7 @@ int ServerConfig::autoAddScreen(const QString name) int serverIndex = -1; int targetIndex = -1; if (!findScreenName(m_ServerName, serverIndex)) { - if (!tryFixNoServer(m_ServerName, serverIndex)) { + if (!fixNoServer(m_ServerName, serverIndex)) { return kAutoAddScreenNoServer; } } @@ -314,7 +314,7 @@ bool ServerConfig::findScreenName(const QString& name, int& index) return found; } -bool ServerConfig::tryFixNoServer(const QString& name, int& index) +bool ServerConfig::fixNoServer(const QString& name, int& index) { bool fixed = false; if (screens()[serverDefaultIndex].isNull()) { diff --git a/src/gui/src/ServerConfig.h b/src/gui/src/ServerConfig.h index 89a6d7cd..b3a48a4f 100644 --- a/src/gui/src/ServerConfig.h +++ b/src/gui/src/ServerConfig.h @@ -92,7 +92,7 @@ class ServerConfig : public BaseConfig private: bool findScreenName(const QString& name, int& index); - bool tryFixNoServer(const QString& name, int& index); + bool fixNoServer(const QString& name, int& index); private: QSettings* m_pSettings;