use a unique_ptr for linkedData in Node

assignment-client/src/AssignmentClientMonitor.cpp

@@ -9,6 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <memory>
 #include <signal.h>
 
 #include <AddressManager.h>
@@ -227,8 +228,9 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<NLPacket> p
                 matchingNode = DependencyManager::get<LimitedNodeList>()->addOrUpdateNode
                     (senderID, NodeType::Unassigned, senderSockAddr, senderSockAddr, false, false);
                 
-                childData = new AssignmentClientChildData(Assignment::Type::AllTypes);
+                auto childData = std::unique_ptr<AssignmentClientChildData>
-                matchingNode->setLinkedData(childData);
+                    { new AssignmentClientChildData(Assignment::Type::AllTypes) };
+                matchingNode->setLinkedData(std::move(childData));
             } else {
                 // tell unknown assignment-client child to exit.
                 qDebug() << "Asking unknown child at" << senderSockAddr << "to exit.";

assignment-client/src/audio/AudioMixer.cpp

@@ -14,6 +14,7 @@
 #include <fstream>
 #include <iostream>
 #include <math.h>
+#include <memory>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -652,7 +653,7 @@ void AudioMixer::run() {
     nodeList->addNodeTypeToInterestSet(NodeType::Agent);
 
     nodeList->linkedDataCreateCallback = [](Node* node) {
-        node->setLinkedData(new AudioMixerClientData());
+        node->setLinkedData(std::unique_ptr<AudioMixerClientData> { new AudioMixerClientData });
     };
 
     // wait until we have the domain-server settings, otherwise we bail

assignment-client/src/avatars/AvatarMixer.cpp

@@ -11,6 +11,7 @@
 
 #include <cfloat>
 #include <random>
+#include <memory>
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDateTime>
@@ -519,7 +520,7 @@ void AvatarMixer::run() {
     nodeList->addNodeTypeToInterestSet(NodeType::Agent);
 
     nodeList->linkedDataCreateCallback = [] (Node* node) {
-        node->setLinkedData(new AvatarMixerClientData());
+        node->setLinkedData(std::unique_ptr<AvatarMixerClientData> { new AvatarMixerClientData });
     };
 
     // setup the timer that will be fired on the broadcast thread

assignment-client/src/entities/EntityServer.cpp

@@ -46,8 +46,8 @@ void EntityServer::handleEntityPacket(QSharedPointer<NLPacket> packet, SharedNod
     }
 }
 
-OctreeQueryNode* EntityServer::createOctreeQueryNode() {
+std::unique_ptr<OctreeQueryNode> EntityServer::createOctreeQueryNode() {
-    return new EntityNodeData();
+    return std::unique_ptr<OctreeQueryNode> { new EntityNodeData() };
 }
 
 OctreePointer EntityServer::createTree() {

assignment-client/src/entities/EntityServer.h

@@ -14,6 +14,8 @@
 
 #include "../octree/OctreeServer.h"
 
+#include <memory>
+
 #include "EntityItem.h"
 #include "EntityServerConsts.h"
 #include "EntityTree.h"
@@ -26,7 +28,7 @@ public:
     ~EntityServer();
 
     // Subclasses must implement these methods
-    virtual OctreeQueryNode* createOctreeQueryNode() override ;
+    virtual std::unique_ptr<OctreeQueryNode> createOctreeQueryNode() override ;
     virtual char getMyNodeType() const override { return NodeType::EntityServer; }
     virtual PacketType getMyQueryMessageType() const override { return PacketType::EntityQuery; }
     virtual const char* getMyServerName() const override { return MODEL_SERVER_NAME; }

assignment-client/src/octree/OctreeServer.cpp

@@ -1108,9 +1108,9 @@ void OctreeServer::run() {
 #endif
 
     nodeList->linkedDataCreateCallback = [] (Node* node) {
-        OctreeQueryNode* newQueryNodeData = _instance->createOctreeQueryNode();
+        auto queryNodeData = _instance->createOctreeQueryNode();
-        newQueryNodeData->init();
+        queryNodeData->init();
-        node->setLinkedData(newQueryNodeData);
+        node->setLinkedData(std::move(queryNodeData));
     };
 
     srand((unsigned)time(0));

assignment-client/src/octree/OctreeServer.h

@@ -12,6 +12,8 @@
 #ifndef hifi_OctreeServer_h
 #define hifi_OctreeServer_h
 
+#include <memory>
+
 #include <QStringList>
 #include <QDateTime>
 #include <QtCore/QCoreApplication>
@@ -61,7 +63,7 @@ public:
     quint64 getLoadElapsedTime() const { return (_persistThread) ? _persistThread->getLoadElapsedTime() : 0; }
 
     // Subclasses must implement these methods
-    virtual OctreeQueryNode* createOctreeQueryNode() = 0;
+    virtual std::unique_ptr<OctreeQueryNode> createOctreeQueryNode() = 0;
     virtual char getMyNodeType() const = 0;
     virtual PacketType getMyQueryMessageType() const = 0;
     virtual const char* getMyServerName() const = 0;

domain-server/src/DomainServer.cpp

@@ -11,6 +11,8 @@
 
 #include "DomainServer.h"
 
+#include <memory>
+
 #include <QDir>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -1640,7 +1642,7 @@ void DomainServer::refreshStaticAssignmentAndAddToQueue(SharedAssignmentPointer&
 
 void DomainServer::nodeAdded(SharedNodePointer node) {
     // we don't use updateNodeWithData, so add the DomainServerNodeData to the node here
-    node->setLinkedData(new DomainServerNodeData());
+    node->setLinkedData(std::unique_ptr<DomainServerNodeData> { new DomainServerNodeData() });
 }
 
 void DomainServer::nodeKilled(SharedNodePointer node) {

libraries/networking/src/Node.cpp

@@ -48,7 +48,6 @@ Node::Node(const QUuid& uuid, NodeType_t type, const HifiSockAddr& publicSocket,
     NetworkPeer(uuid, publicSocket, localSocket, parent),
     _type(type),
     _connectionSecret(connectionSecret),
-    _linkedData(NULL),
     _isAlive(true),
     _pingMs(-1),  // "Uninitialized"
     _clockSkewUsec(0),
@@ -61,10 +60,6 @@ Node::Node(const QUuid& uuid, NodeType_t type, const HifiSockAddr& publicSocket,
     setType(_type);
 }
 
-Node::~Node() {
-    delete _linkedData;
-}
-
 void Node::setType(char type) {
     _type = type;
     

libraries/networking/src/Node.h

@@ -12,6 +12,7 @@
 #ifndef hifi_Node_h
 #define hifi_Node_h
 
+#include <memory>
 #include <ostream>
 #include <stdint.h>
 
@@ -34,7 +35,6 @@ public:
          const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket,
          bool canAdjustLocks, bool canRez, const QUuid& connectionSecret = QUuid(),
          QObject* parent = 0);
-    ~Node();
 
     bool operator==(const Node& otherNode) const { return _uuid == otherNode._uuid; }
     bool operator!=(const Node& otherNode) const { return !(*this == otherNode); }
@@ -45,8 +45,8 @@ public:
     const QUuid& getConnectionSecret() const { return _connectionSecret; }
     void setConnectionSecret(const QUuid& connectionSecret) { _connectionSecret = connectionSecret; }
 
-    NodeData* getLinkedData() const { return _linkedData; }
+    NodeData* getLinkedData() const { return _linkedData.get(); }
-    void setLinkedData(NodeData* linkedData) { _linkedData = linkedData; }
+    void setLinkedData(std::unique_ptr<NodeData> linkedData) { _linkedData = std::move(linkedData); }
 
     bool isAlive() const { return _isAlive; }
     void setAlive(bool isAlive) { _isAlive = isAlive; }
@@ -75,7 +75,7 @@ private:
     NodeType_t _type;
 
     QUuid _connectionSecret;
-    NodeData* _linkedData;
+    std::unique_ptr<NodeData> _linkedData;
     bool _isAlive;
     int _pingMs;
     int _clockSkewUsec;