From a9e781f56546680bac037b0bc1624d61d7a3db49 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Thu, 22 Dec 2016 15:25:43 -0800 Subject: [PATCH] naming consistentcy. No functional changes. --- assignment-client/src/avatars/AvatarMixer.cpp | 10 +++++----- assignment-client/src/avatars/AvatarMixer.h | 2 +- assignment-client/src/avatars/AvatarMixerClientData.h | 2 +- libraries/networking/src/NodeList.cpp | 4 ++-- libraries/networking/src/udt/PacketHeaders.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 1192dfb200..fdb6b10cab 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -51,7 +51,7 @@ AvatarMixer::AvatarMixer(ReceivedMessage& message) : packetReceiver.registerListener(PacketType::NodeIgnoreRequest, this, "handleNodeIgnoreRequestPacket"); packetReceiver.registerListener(PacketType::NodeUnignoreRequest, this, "handleNodeUnignoreRequestPacket"); packetReceiver.registerListener(PacketType::RadiusIgnoreRequest, this, "handleRadiusIgnoreRequestPacket"); - packetReceiver.registerListener(PacketType::RequestDomainListData, this, "handleRequestDomainListDataPacket"); + packetReceiver.registerListener(PacketType::RequestsDomainListData, this, "handleRequestsDomainListDataPacket"); auto nodeList = DependencyManager::get(); connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &AvatarMixer::handlePacketVersionMismatch); @@ -536,18 +536,18 @@ void AvatarMixer::handleViewFrustumPacket(QSharedPointer messag } } -void AvatarMixer::handleRequestDomainListDataPacket(QSharedPointer message, SharedNodePointer senderNode) { +void AvatarMixer::handleRequestsDomainListDataPacket(QSharedPointer message, SharedNodePointer senderNode) { auto nodeList = DependencyManager::get(); nodeList->getOrCreateLinkedData(senderNode); - qDebug() << "HRS FIXME received requestDomainListData packet from" << senderNode->getUUID(); + qDebug() << "HRS FIXME received RequestsDomainListData packet from" << senderNode->getUUID(); if (senderNode->getLinkedData()) { AvatarMixerClientData* nodeData = dynamic_cast(senderNode->getLinkedData()); if (nodeData != nullptr) { bool isRequesting; message->readPrimitive(&isRequesting); - qDebug() << "HRS FIXME handling requestDomainListData packet" << isRequesting << "from" << nodeData->getNodeID(); - nodeData->setRequestDomainListData(isRequesting); + qDebug() << "HRS FIXME handling RequestsDomainListData packet" << isRequesting << "from" << nodeData->getNodeID(); + nodeData->setRequestsDomainListData(isRequesting); } } } diff --git a/assignment-client/src/avatars/AvatarMixer.h b/assignment-client/src/avatars/AvatarMixer.h index 296b82f1aa..865dd36106 100644 --- a/assignment-client/src/avatars/AvatarMixer.h +++ b/assignment-client/src/avatars/AvatarMixer.h @@ -43,7 +43,7 @@ private slots: void handleNodeIgnoreRequestPacket(QSharedPointer message, SharedNodePointer senderNode); void handleNodeUnignoreRequestPacket(QSharedPointer message, SharedNodePointer senderNode); void handleRadiusIgnoreRequestPacket(QSharedPointer packet, SharedNodePointer sendingNode); - void handleRequestDomainListDataPacket(QSharedPointer message, SharedNodePointer senderNode); + void handleRequestsDomainListDataPacket(QSharedPointer message, SharedNodePointer senderNode); void domainSettingsRequestComplete(); void handlePacketVersionMismatch(PacketType type, const HifiSockAddr& senderSockAddr, const QUuid& senderUUID); diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h index 462968eb37..861086893a 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.h +++ b/assignment-client/src/avatars/AvatarMixerClientData.h @@ -102,7 +102,7 @@ public: const QString& getBaseDisplayName() { return _baseDisplayName; } void setBaseDisplayName(const QString& baseDisplayName) { _baseDisplayName = baseDisplayName; } bool getRequestsDomainListData() { return _requestsDomainListData; } - void setRequestDomainListData(bool requesting) { _requestsDomainListData = requesting; } + void setRequestsDomainListData(bool requesting) { _requestsDomainListData = requesting; } private: AvatarSharedPointer _avatar { new AvatarData() }; diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 49c689b007..6905feb370 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -971,10 +971,10 @@ void NodeList::setRequestsDomainListData(bool isRequesting) { eachMatchingNode([](const SharedNodePointer& node)->bool { return node->getType() == NodeType::AvatarMixer; }, [this, isRequesting](const SharedNodePointer& destinationNode) { - auto packet = NLPacket::create(PacketType::RequestDomainListData, sizeof(bool), true); // reliable + auto packet = NLPacket::create(PacketType::RequestsDomainListData, sizeof(bool), true); // reliable packet->writePrimitive(isRequesting); sendPacket(std::move(packet), *destinationNode); - qDebug() << "HRS FIXME sending requestDomainListData packet" << isRequesting; + qDebug() << "HRS FIXME sending RequestsDomainListData packet" << isRequesting; }); _requestsDomainListData = isRequesting; } \ No newline at end of file diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index c7e497bf79..cae4eaa43e 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -104,7 +104,7 @@ public: UsernameFromIDRequest, UsernameFromIDReply, ViewFrustum, - RequestDomainListData, + RequestsDomainListData, NodeUnignoreRequest, LAST_PACKET_TYPE = NodeUnignoreRequest };