From 78ff6477bdb6479da9d6dd328827b668f7928b29 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 10 Jul 2015 08:45:21 -0700 Subject: [PATCH] Update OctreePacketProcessor to use QSharedPointer --- interface/src/octree/OctreePacketProcessor.cpp | 8 ++++---- interface/src/octree/OctreePacketProcessor.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp index 5ba191e3c7..4f3a4765ed 100644 --- a/interface/src/octree/OctreePacketProcessor.cpp +++ b/interface/src/octree/OctreePacketProcessor.cpp @@ -26,28 +26,28 @@ OctreePacketProcessor::OctreePacketProcessor() { } // TODO implement packet processing in PacketType-specific methods -void OctreePacketProcessor::handleEntityDataPacket(NLPacket& packet, HifiSockAddr senderSockAddr) { +void OctreePacketProcessor::handleEntityDataPacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { SharedNodePointer sendingNode = DependencyManager::get()->nodeWithUUID(packet->getSourceID()); if (sendingNode) { processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader())); } } -void OctreePacketProcessor::handleEntityErasePacket(NLPacket& packet, HifiSockAddr senderSockAddr) { +void OctreePacketProcessor::handleEntityErasePacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { SharedNodePointer sendingNode = DependencyManager::get()->nodeWithUUID(packet->getSourceID()); if (sendingNode) { processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader())); } } -void OctreePacketProcessor::handleOctreeStatsPacket(NLPacket& packet, HifiSockAddr senderSockAddr) { +void OctreePacketProcessor::handleOctreeStatsPacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { SharedNodePointer sendingNode = DependencyManager::get()->nodeWithUUID(packet->getSourceID()); if (sendingNode) { processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader())); } } -void OctreePacketProcessor::handleEnvironmentDataPacket(NLPacket& packet, HifiSockAddr senderSockAddr) { +void OctreePacketProcessor::handleEnvironmentDataPacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { SharedNodePointer sendingNode = DependencyManager::get()->nodeWithUUID(packet->getSourceID()); if (sendingNode) { processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader())); diff --git a/interface/src/octree/OctreePacketProcessor.h b/interface/src/octree/OctreePacketProcessor.h index 0aac9538bb..73d9161a74 100644 --- a/interface/src/octree/OctreePacketProcessor.h +++ b/interface/src/octree/OctreePacketProcessor.h @@ -30,9 +30,9 @@ protected: virtual void processPacket(const SharedNodePointer& sendingNode, const QByteArray& packet); private slots: - void handleEntityDataPacket(NLPacket& packet, HifiSockAddr senderSockAddr); - void handleEntityErasePacket(NLPacket& packet, HifiSockAddr senderSockAddr); - void handleOctreeStatsPacket(NLPacket& packet, HifiSockAddr senderSockAddr); - void handleEnvironmentDataPacket(NLPacket& packet, HifiSockAddr senderSockAddr); + void handleEntityDataPacket(QSharedPointer packet, HifiSockAddr senderSockAddr); + void handleEntityErasePacket(QSharedPointer packet, HifiSockAddr senderSockAddr); + void handleOctreeStatsPacket(QSharedPointer packet, HifiSockAddr senderSockAddr); + void handleEnvironmentDataPacket(QSharedPointer packet, HifiSockAddr senderSockAddr); }; #endif // hifi_OctreePacketProcessor_h