From 4ed0c24a739a169001b6658a563bb5bbb20727ef Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 7 Mar 2018 18:25:55 -0800
Subject: [PATCH] use static QStrings rather than functions

---
 interface/src/Application.cpp                    | 4 ++--
 libraries/networking/src/AddressManager.cpp      | 2 +-
 libraries/networking/src/DomainHandler.cpp       | 4 ----
 libraries/networking/src/DomainHandler.h         | 2 +-
 libraries/networking/src/NetworkingConstants.cpp | 5 ++---
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 454c46c16e..1b55edbb2d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6484,8 +6484,8 @@ void Application::replaceDomainContent(const QString& url) {
         limitedNodeList->sendPacket(std::move(octreeFilePacket), domainHandler.getSockAddr());
     });
     auto addressManager = DependencyManager::get<AddressManager>();
-    addressManager->handleLookupString(DOMAIN_SPAWNING_POINT());
-    QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT();
+    addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
+    QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
     qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
     DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
 }
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index b3cc3b09c3..dcd3e7dc5e 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -299,7 +299,7 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
         setDomainInfo(domainUrl, trigger);
         DependencyManager::get<NodeList>()->getDomainHandler().setIsConnected(true);
         emit lookupResultsFinished();
-        handlePath(DOMAIN_SPAWNING_POINT(), LookupTrigger::Internal, false);
+        handlePath(DOMAIN_SPAWNING_POINT, LookupTrigger::Internal, false);
         return true;
     }
 
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index 1bc3f0ca10..e069f2cd06 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -27,10 +27,6 @@
 
 #include "DomainHandler.h"
 
-QString DOMAIN_SPAWNING_POINT() {
-    return QString("/0, -10, 0");
-}
-
 DomainHandler::DomainHandler(QObject* parent) :
     QObject(parent),
     _sockAddr(HifiSockAddr(QHostAddress::Null, DEFAULT_DOMAIN_SERVER_PORT)),
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index 1110547353..fbc60e2492 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -202,7 +202,7 @@ private:
     QTimer _apiRefreshTimer;
 };
 
-QString DOMAIN_SPAWNING_POINT();
+const QString DOMAIN_SPAWNING_POINT { "/0, -10, 0" };
 
 
 #endif // hifi_DomainHandler_h
diff --git a/libraries/networking/src/NetworkingConstants.cpp b/libraries/networking/src/NetworkingConstants.cpp
index fdbb4a3eef..622c307efa 100644
--- a/libraries/networking/src/NetworkingConstants.cpp
+++ b/libraries/networking/src/NetworkingConstants.cpp
@@ -9,15 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-
 #include "NetworkingConstants.h"
 
 namespace NetworkingConstants {
     // You can change the return of this function if you want to use a custom metaverse URL at compile time
     // or you can pass a custom URL via the env variable
     QUrl METAVERSE_SERVER_URL() {
-        static const QString HIFI_METAVERSE_URL_ENV = "HIFI_METAVERSE_URL";
-        static const QUrl serverURL = QProcessEnvironment::systemEnvironment().contains(HIFI_METAVERSE_URL_ENV)
+        const QString HIFI_METAVERSE_URL_ENV = "HIFI_METAVERSE_URL";
+        const QUrl serverURL = QProcessEnvironment::systemEnvironment().contains(HIFI_METAVERSE_URL_ENV)
             ? QUrl(QProcessEnvironment::systemEnvironment().value(HIFI_METAVERSE_URL_ENV))
             : METAVERSE_SERVER_URL_STABLE;
         return serverURL;