Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use static QStrings rather than functions

Browse source
This commit is contained in:
Seth Alves 2018-03-07 18:25:55 -08:00
parent 12eb0e4109
commit 4ed0c24a73
5 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -6484,8 +6484,8 @@ void Application::replaceDomainContent(const QString& url) {
limitedNodeList->sendPacket(std::move(octreeFilePacket), domainHandler.getSockAddr()); limitedNodeList->sendPacket(std::move(octreeFilePacket), domainHandler.getSockAddr());
}); });
auto addressManager = DependencyManager::get<AddressManager>(); auto addressManager = DependencyManager::get<AddressManager>();
addressManager->handleLookupString(DOMAIN_SPAWNING_POINT()); addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT(); QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress; qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress); DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
} }

2
libraries/networking/src/AddressManager.cpp
View file

@ -299,7 +299,7 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
setDomainInfo(domainUrl, trigger); setDomainInfo(domainUrl, trigger);
DependencyManager::get<NodeList>()->getDomainHandler().setIsConnected(true); DependencyManager::get<NodeList>()->getDomainHandler().setIsConnected(true);
emit lookupResultsFinished(); emit lookupResultsFinished();
handlePath(DOMAIN_SPAWNING_POINT(), LookupTrigger::Internal, false); handlePath(DOMAIN_SPAWNING_POINT, LookupTrigger::Internal, false);
return true; return true;
} }

4
libraries/networking/src/DomainHandler.cpp
View file

@ -27,10 +27,6 @@
#include "DomainHandler.h" #include "DomainHandler.h"
QString DOMAIN_SPAWNING_POINT() {
return QString("/0, -10, 0");
}
DomainHandler::DomainHandler(QObject* parent) : DomainHandler::DomainHandler(QObject* parent) :
QObject(parent), QObject(parent),
_sockAddr(HifiSockAddr(QHostAddress::Null, DEFAULT_DOMAIN_SERVER_PORT)), _sockAddr(HifiSockAddr(QHostAddress::Null, DEFAULT_DOMAIN_SERVER_PORT)),

2
libraries/networking/src/DomainHandler.h
View file

@ -202,7 +202,7 @@ private:
QTimer _apiRefreshTimer; QTimer _apiRefreshTimer;
}; };
QString DOMAIN_SPAWNING_POINT(); const QString DOMAIN_SPAWNING_POINT { "/0, -10, 0" };
#endif // hifi_DomainHandler_h #endif // hifi_DomainHandler_h

5
libraries/networking/src/NetworkingConstants.cpp
View file

@ -9,15 +9,14 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include "NetworkingConstants.h" #include "NetworkingConstants.h"
namespace NetworkingConstants { namespace NetworkingConstants {
// You can change the return of this function if you want to use a custom metaverse URL at compile time // 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 // or you can pass a custom URL via the env variable
QUrl METAVERSE_SERVER_URL() { QUrl METAVERSE_SERVER_URL() {
static const QString HIFI_METAVERSE_URL_ENV = "HIFI_METAVERSE_URL"; const QString HIFI_METAVERSE_URL_ENV = "HIFI_METAVERSE_URL";
static const QUrl serverURL = QProcessEnvironment::systemEnvironment().contains(HIFI_METAVERSE_URL_ENV) const QUrl serverURL = QProcessEnvironment::systemEnvironment().contains(HIFI_METAVERSE_URL_ENV)
? QUrl(QProcessEnvironment::systemEnvironment().value(HIFI_METAVERSE_URL_ENV)) ? QUrl(QProcessEnvironment::systemEnvironment().value(HIFI_METAVERSE_URL_ENV))
: METAVERSE_SERVER_URL_STABLE; : METAVERSE_SERVER_URL_STABLE;
return serverURL; return serverURL;