From ba8aa5b50cc1a01b31c1c62663c79cd5295cee58 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 19 Sep 2016 16:38:34 -0700 Subject: [PATCH] fix camelcase --- domain-server/src/DomainServer.cpp | 6 +++--- domain-server/src/DomainServer.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 6a30604abd..4489f0d607 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -198,7 +198,7 @@ void DomainServer::parseCommandLine() { if (parser.isSet(domainIDOption)) { _overridingDomainID = QUuid(parser.value(domainIDOption)); - _overRideDomainID = true; + _overrideDomainID = true; qDebug() << "domain-server ID is" << _overridingDomainID; } } @@ -351,7 +351,7 @@ void DomainServer::handleTempDomainSuccess(QNetworkReply& requestReply) { auto domainObject = jsonObject[DATA_KEY].toObject()[DOMAIN_KEY].toObject(); if (!domainObject.isEmpty()) { - auto id = _overRideDomainID ? _overridingDomainID.toString() : domainObject[ID_KEY].toString(); + auto id = _overrideDomainID ? _overridingDomainID.toString() : domainObject[ID_KEY].toString(); auto name = domainObject[NAME_KEY].toString(); auto key = domainObject[KEY_KEY].toString(); @@ -462,7 +462,7 @@ void DomainServer::setupNodeListAndAssignments() { // set our LimitedNodeList UUID to match the UUID from our config // nodes will currently use this to add resources to data-web that relate to our domain bool isMetaverseDomain = false; - if (_overRideDomainID) { + if (_overrideDomainID) { nodeList->setSessionUUID(_overridingDomainID); isMetaverseDomain = true; // assume metaverse domain } else { diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h index de08c15468..066f2be0d1 100644 --- a/domain-server/src/DomainServer.h +++ b/domain-server/src/DomainServer.h @@ -209,7 +209,7 @@ private: QString _iceServerAddr; int _iceServerPort; - bool _overRideDomainID { false }; // should we override the domain-id from settings? + bool _overrideDomainID { false }; // should we override the domain-id from settings? QUuid _overridingDomainID { QUuid() }; // what should we override it with? };