From 5c9b1edb86bb435c1c41053b614a61073319065a Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 14 Dec 2020 01:03:36 -0500 Subject: [PATCH] Convert QString to QJsonObject. --- domain-server/src/DomainServer.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 5d72f71797..1d7ef7fcfc 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1507,18 +1507,19 @@ QJsonObject jsonForDomainSocketUpdate(const HifiSockAddr& socket) { } void DomainServer::performIPAddressPortUpdate(const HifiSockAddr& newPublicSockAddr) { + const QString& DOMAIN_SERVER_SETTINGS_KEY = "domain_server"; const QString& publicSocketAddress = newPublicSockAddr.getAddress().toString(); const int publicSocketPort = newPublicSockAddr.getPort(); sendHeartbeatToMetaverse(publicSocketAddress, publicSocketPort); - QString newSettingsJSON = QString("{\"domain_server\": { \"%1\": \"%2\", \"%3\": %4}}") - .arg(PUBLIC_SOCKET_ADDRESS_KEY) - .arg(publicSocketAddress) - .arg(PUBLIC_SOCKET_PORT_KEY) - .arg(publicSocketPort); - auto settingsDocument = QJsonDocument::fromJson(newSettingsJSON.toUtf8()); - _settingsManager.recurseJSONObjectAndOverwriteSettings(settingsDocument.object(), DomainSettings); + QJsonObject rootObject; + QJsonObject domainServerObject; + domainServerObject.insert(PUBLIC_SOCKET_ADDRESS_KEY, publicSocketAddress); + domainServerObject.insert(PUBLIC_SOCKET_PORT_KEY, publicSocketPort); + rootObject.insert(DOMAIN_SERVER_SETTINGS_KEY, domainServerObject); + QJsonDocument doc(rootObject); + _settingsManager.recurseJSONObjectAndOverwriteSettings(rootObject, DomainSettings); } void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress, const int port) {