From 594165782ae1c9194b31764f5380602478752230 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 17 Jan 2014 16:20:22 -0800
Subject: [PATCH] repair badly scoped usage of QMutexLocker

---
 interface/src/Application.cpp     |  4 ++--
 libraries/shared/src/NodeList.cpp | 23 +++++++++++------------
 libraries/shared/src/NodeList.h   |  3 ++-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 64c883b7f6..229cedf55c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2006,7 +2006,7 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm::
     PerformanceWarning warn(showWarnings, "Application::updateAvatars()");
 
     foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
-        QMutexLocker(&node->getMutex());
+        QMutexLocker locker(&node->getMutex());
         if (node->getLinkedData()) {
             Avatar *avatar = (Avatar *)node->getLinkedData();
             if (!avatar->isInitialized()) {
@@ -3659,7 +3659,7 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) {
         NodeList* nodeList = NodeList::getInstance();
 
         foreach (const SharedNodePointer& node, nodeList->getNodeHash()) {
-            QMutexLocker(&node->getMutex());
+            QMutexLocker locker(&node->getMutex());
 
             if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) {
                 Avatar *avatar = (Avatar *)node->getLinkedData();
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 1813e79e8e..f33137a092 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -231,7 +231,7 @@ void NodeList::processBulkNodeData(const HifiSockAddr& senderAddress, unsigned c
 }
 
 int NodeList::updateNodeWithData(Node *node, const HifiSockAddr& senderSockAddr, unsigned char *packetData, int dataBytes) {
-    QMutexLocker(&node->getMutex());
+    QMutexLocker locker(&node->getMutex());
 
     node->setLastHeardMicrostamp(usecTimestampNow());
 
@@ -267,16 +267,19 @@ SharedNodePointer NodeList::nodeWithAddress(const HifiSockAddr &senderSockAddr)
 }
 
 SharedNodePointer NodeList::nodeWithUUID(const QUuid& nodeUUID) {
-    _nodeHashMutex.lock();
-    SharedNodePointer matchingNode = _nodeHash.value(nodeUUID);
-    _nodeHashMutex.unlock();
-    return matchingNode;
+    QMutexLocker locker(&_nodeHashMutex);
+    return _nodeHash.value(nodeUUID);
+}
+
+NodeHash NodeList::getNodeHash() {
+    QMutexLocker locker(&_nodeHashMutex);
+    return NodeHash(_nodeHash);
 }
 
 void NodeList::clear() {
     qDebug() << "Clearing the NodeList. Deleting all nodes in list.";
     
-    _nodeHashMutex.lock();
+    QMutexLocker locker(&_nodeHashMutex);
 
     NodeHash::iterator nodeItem = _nodeHash.begin();
 
@@ -284,8 +287,6 @@ void NodeList::clear() {
     while (nodeItem != _nodeHash.end()) {
         nodeItem = killNodeAtHashIterator(nodeItem);
     }
-    
-    _nodeHashMutex.unlock();
 }
 
 void NodeList::reset() {
@@ -444,14 +445,12 @@ void NodeList::processSTUNResponse(unsigned char* packetData, size_t dataBytes)
 }
 
 void NodeList::killNodeWithUUID(const QUuid& nodeUUID) {
-    _nodeHashMutex.lock();
+    QMutexLocker locker(&_nodeHashMutex);
     
     NodeHash::iterator nodeItemToKill = _nodeHash.find(nodeUUID);
     if (nodeItemToKill != _nodeHash.end()) {
         killNodeAtHashIterator(nodeItemToKill);
     }
-    
-    _nodeHashMutex.unlock();
 }
 
 NodeHash::iterator NodeList::killNodeAtHashIterator(NodeHash::iterator& nodeItemToKill) {
@@ -705,7 +704,7 @@ SharedNodePointer NodeList::addOrUpdateNode(const QUuid& uuid, char nodeType,
     } else {
         _nodeHashMutex.unlock();
         
-        QMutexLocker(&matchingNode->getMutex());
+        QMutexLocker locker(&matchingNode->getMutex());
 
         if (matchingNode->getType() == NODE_TYPE_AUDIO_MIXER ||
             matchingNode->getType() == NODE_TYPE_VOXEL_SERVER ||
diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h
index d8acc6fa24..b5e27564b1 100644
--- a/libraries/shared/src/NodeList.h
+++ b/libraries/shared/src/NodeList.h
@@ -21,6 +21,7 @@
 #include <unistd.h> // not on windows, not needed for mac or windows
 #endif
 
+#include <QtCore/QMutex>
 #include <QtCore/QSettings>
 #include <QtCore/QSharedPointer>
 #include <QtNetwork/QHostAddress>
@@ -81,7 +82,7 @@ public:
 
     void(*linkedDataCreateCallback)(Node *);
 
-    const NodeHash& getNodeHash() { return _nodeHash; }
+    NodeHash getNodeHash();
     int size() const { return _nodeHash.size(); }
 
     int getNumNoReplyDomainCheckIns() const { return _numNoReplyDomainCheckIns; }