From e72f6d16cc6cbdf3b8ae7d53437da2a0d20092cf Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 6 Feb 2014 11:43:23 -0800 Subject: [PATCH] rename NodeList ownerUUID to sessionUUID --- assignment-client/src/AssignmentClient.cpp | 2 +- interface/src/Application.cpp | 2 +- libraries/avatars/src/AvatarData.h | 2 +- .../src/DataServerScriptingInterface.cpp | 2 +- libraries/shared/src/NodeList.cpp | 18 +++++++++--------- libraries/shared/src/NodeList.h | 6 +++--- libraries/shared/src/PacketHeaders.cpp | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index b2a5555e36..b294f48fac 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -131,7 +131,7 @@ void AssignmentClient::readPendingDatagrams() { // switch our nodelist domain IP and port to whoever sent us the assignment nodeList->setDomainSockAddr(senderSockAddr); - nodeList->setOwnerUUID(_currentAssignment->getUUID()); + nodeList->setSessionUUID(_currentAssignment->getUUID()); qDebug() << "Destination IP for assignment is" << nodeList->getDomainIP().toString(); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 43a4b61f02..c492fc8fc9 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3850,7 +3850,7 @@ void Application::updateWindowTitle(){ QString buildVersion = " (build " + applicationVersion() + ")"; NodeList* nodeList = NodeList::getInstance(); - QString title = QString() + _profile.getUsername() + " " + nodeList->getOwnerUUID().toString() + QString title = QString() + _profile.getUsername() + " " + nodeList->getSessionUUID().toString() + " @ " + nodeList->getDomainHostname() + buildVersion; qDebug("Application title set to: %s", title.toStdString().c_str()); diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 5e4f7acb2c..56d345ce75 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -73,7 +73,7 @@ class AvatarData : public NodeData { Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientation) Q_PROPERTY(float headPitch READ getHeadPitch WRITE setHeadPitch) - + public: AvatarData(); ~AvatarData(); diff --git a/libraries/script-engine/src/DataServerScriptingInterface.cpp b/libraries/script-engine/src/DataServerScriptingInterface.cpp index 6effd7ebdc..04efed2bce 100644 --- a/libraries/script-engine/src/DataServerScriptingInterface.cpp +++ b/libraries/script-engine/src/DataServerScriptingInterface.cpp @@ -17,5 +17,5 @@ DataServerScriptingInterface::DataServerScriptingInterface() } void DataServerScriptingInterface::setValueForKey(const QString& key, const QString& value) { - DataServerClient::putValueForKeyAndUUID(key, value, NodeList::getInstance()->getOwnerUUID()); + DataServerClient::putValueForKeyAndUUID(key, value, NodeList::getInstance()->getSessionUUID()); } \ No newline at end of file diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 4b5fdfeaa6..e357dd130e 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -64,7 +64,7 @@ NodeList::NodeList(char newOwnerType, unsigned short int newSocketListenPort) : _nodeSocket(this), _ownerType(newOwnerType), _nodeTypesOfInterest(), - _ownerUUID(), + _sessionUUID(), _numNoReplyDomainCheckIns(0), _assignmentServerSocket(), _publicSockAddr(), @@ -257,7 +257,7 @@ void NodeList::reset() { _nodeTypesOfInterest.clear(); // refresh the owner UUID - _ownerUUID = QUuid::createUuid(); + _sessionUUID = QUuid::createUuid(); } void NodeList::addNodeTypeToInterestSet(NodeType_t nodeTypeToAdd) { @@ -492,13 +492,13 @@ void NodeList::sendDomainServerCheckIn() { } } -void NodeList::setOwnerUUID(const QUuid& ownerUUID) { - QUuid oldUUID = _ownerUUID; - _ownerUUID = ownerUUID; +void NodeList::setSessionUUID(const QUuid& sessionUUID) { + QUuid oldUUID = _sessionUUID; + _sessionUUID = sessionUUID; - if (ownerUUID != oldUUID) { - qDebug() << "NodeList UUID changed from" << oldUUID << "to" << _ownerUUID; - emit uuidChanged(ownerUUID); + if (sessionUUID != oldUUID) { + qDebug() << "NodeList UUID changed from" << oldUUID << "to" << _sessionUUID; + emit uuidChanged(sessionUUID); } } @@ -522,7 +522,7 @@ int NodeList::processDomainServerList(const QByteArray& packet) { // pull our owner UUID from the packet, it's always the first thing QUuid newUUID; packetStream >> newUUID; - setOwnerUUID(newUUID); + setSessionUUID(newUUID); // pull each node in the packet while(packetStream.device()->pos() < packet.size()) { diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h index 90215a27b5..daac87da28 100644 --- a/libraries/shared/src/NodeList.h +++ b/libraries/shared/src/NodeList.h @@ -72,8 +72,8 @@ public: unsigned short getDomainPort() const { return _domainSockAddr.getPort(); } - const QUuid& getOwnerUUID() const { return _ownerUUID; } - void setOwnerUUID(const QUuid& ownerUUID); + const QUuid& getSessionUUID() const { return _sessionUUID; } + void setSessionUUID(const QUuid& sessionUUID); QUdpSocket& getNodeSocket() { return _nodeSocket; } @@ -146,7 +146,7 @@ private: QUdpSocket _nodeSocket; NodeType_t _ownerType; NodeSet _nodeTypesOfInterest; - QUuid _ownerUUID; + QUuid _sessionUUID; int _numNoReplyDomainCheckIns; HifiSockAddr _assignmentServerSocket; HifiSockAddr _publicSockAddr; diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp index 16e7cca1c1..d350a8335c 100644 --- a/libraries/shared/src/PacketHeaders.cpp +++ b/libraries/shared/src/PacketHeaders.cpp @@ -69,7 +69,7 @@ int populatePacketHeader(char* packet, PacketType type, const QUuid& connectionU int numTypeBytes = packArithmeticallyCodedValue(type, packet); packet[numTypeBytes] = versionForPacketType(type); - QUuid packUUID = connectionUUID.isNull() ? NodeList::getInstance()->getOwnerUUID() : connectionUUID; + QUuid packUUID = connectionUUID.isNull() ? NodeList::getInstance()->getSessionUUID() : connectionUUID; QByteArray rfcUUID = packUUID.toRfc4122(); memcpy(packet + numTypeBytes + sizeof(PacketVersion), rfcUUID.constData(), NUM_BYTES_RFC4122_UUID);