From 046828ee5de33b5284eb1a8df643f0ba8f8e468f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 28 May 2015 16:58:58 -0700 Subject: [PATCH] make the LNL the parent of any Nodes it adds --- libraries/networking/src/LimitedNodeList.cpp | 2 +- libraries/networking/src/Node.cpp | 5 +++-- libraries/networking/src/Node.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 61d844c1be..aa0ab262d7 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -488,7 +488,7 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t return matchingNode; } else { // we didn't have this node, so add them - Node* newNode = new Node(uuid, nodeType, publicSocket, localSocket, canAdjustLocks, canRez, connectionSecret); + Node* newNode = new Node(uuid, nodeType, publicSocket, localSocket, canAdjustLocks, canRez, connectionSecret, this); if (nodeType == NodeType::AudioMixer) { LimitedNodeList::flagTimeForConnectionStep(LimitedNodeList::AddedAudioMixer); diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp index 94b57b3f59..05da87d69a 100644 --- a/libraries/networking/src/Node.cpp +++ b/libraries/networking/src/Node.cpp @@ -41,8 +41,9 @@ const QString& NodeType::getNodeTypeName(NodeType_t nodeType) { } Node::Node(const QUuid& uuid, NodeType_t type, const HifiSockAddr& publicSocket, - const HifiSockAddr& localSocket, bool canAdjustLocks, bool canRez, const QUuid& connectionSecret) : - NetworkPeer(uuid, publicSocket, localSocket), + const HifiSockAddr& localSocket, bool canAdjustLocks, bool canRez, const QUuid& connectionSecret, + QObject* parent) : + NetworkPeer(uuid, publicSocket, localSocket, parent), _type(type), _connectionSecret(connectionSecret), _linkedData(NULL), diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h index 1eaf1a02c7..b1f5d8b037 100644 --- a/libraries/networking/src/Node.h +++ b/libraries/networking/src/Node.h @@ -47,7 +47,8 @@ class Node : public NetworkPeer { public: Node(const QUuid& uuid, NodeType_t type, const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket, - bool canAdjustLocks, bool canRez, const QUuid& connectionSecret = QUuid()); + bool canAdjustLocks, bool canRez, const QUuid& connectionSecret = QUuid(), + QObject* parent = 0); ~Node(); bool operator==(const Node& otherNode) const { return _uuid == otherNode._uuid; }