From be78d7f3aaa1e3234e7bcd1d9ad5db2da3703bc0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 1 Sep 2015 10:20:06 -0600 Subject: [PATCH] fix headers for move of UUID to shared --- libraries/networking/src/AddressManager.cpp | 3 ++- libraries/networking/src/DataServerAccountInfo.cpp | 3 ++- libraries/networking/src/LimitedNodeList.cpp | 2 +- libraries/networking/src/NLPacket.h | 3 ++- libraries/networking/src/NetworkPeer.cpp | 3 ++- libraries/networking/src/Node.cpp | 3 ++- libraries/networking/src/NodeList.cpp | 9 ++++++--- libraries/networking/src/WalletTransaction.cpp | 3 ++- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index ed4728ad78..f99e498ebf 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -18,11 +18,12 @@ #include #include +#include #include "AddressManager.h" #include "NodeList.h" #include "NetworkLogging.h" -#include "UUID.h" + const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager"; const QString SETTINGS_CURRENT_ADDRESS_KEY = "address"; diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp index 0628e21574..5d633a8df1 100644 --- a/libraries/networking/src/DataServerAccountInfo.cpp +++ b/libraries/networking/src/DataServerAccountInfo.cpp @@ -16,7 +16,8 @@ #include #include -#include "UUID.h" +#include + #include "NetworkLogging.h" #include "DataServerAccountInfo.h" diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 2d1c98287c..d874921ada 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -26,11 +26,11 @@ #include #include #include +#include #include "AccountManager.h" #include "Assignment.h" #include "HifiSockAddr.h" -#include "UUID.h" #include "NetworkLogging.h" #include "udt/Packet.h" diff --git a/libraries/networking/src/NLPacket.h b/libraries/networking/src/NLPacket.h index b5d5fc0766..57ada84607 100644 --- a/libraries/networking/src/NLPacket.h +++ b/libraries/networking/src/NLPacket.h @@ -14,7 +14,8 @@ #include -#include "UUID.h" +#include + #include "udt/Packet.h" class NLPacket : public udt::Packet { diff --git a/libraries/networking/src/NetworkPeer.cpp b/libraries/networking/src/NetworkPeer.cpp index 0ffb87fe6c..b17656aea0 100644 --- a/libraries/networking/src/NetworkPeer.cpp +++ b/libraries/networking/src/NetworkPeer.cpp @@ -16,10 +16,11 @@ #include #include +#include #include "BandwidthRecorder.h" #include "NetworkLogging.h" -#include "UUID.h" + NetworkPeer::NetworkPeer(QObject* parent) : QObject(parent), diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp index 2b332d820d..5fea670dd0 100644 --- a/libraries/networking/src/Node.cpp +++ b/libraries/networking/src/Node.cpp @@ -12,9 +12,10 @@ #include #include +#include + #include "Node.h" #include "SharedUtil.h" -#include "UUID.h" #include #include diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index c4053a871b..cf202fa83a 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -9,6 +9,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#include "NodeList.h" + #include #include #include @@ -19,17 +21,18 @@ #include #include +#include #include "AccountManager.h" #include "AddressManager.h" #include "Assignment.h" #include "HifiSockAddr.h" #include "JSONBreakableMarshal.h" -#include "NodeList.h" + +#include "NetworkLogging.h" #include "udt/PacketHeaders.h" #include "SharedUtil.h" -#include "UUID.h" -#include "NetworkLogging.h" + NodeList::NodeList(char newOwnerType, unsigned short socketListenPort, unsigned short dtlsListenPort) : LimitedNodeList(socketListenPort, dtlsListenPort), diff --git a/libraries/networking/src/WalletTransaction.cpp b/libraries/networking/src/WalletTransaction.cpp index 67fc73de07..0c823555fd 100644 --- a/libraries/networking/src/WalletTransaction.cpp +++ b/libraries/networking/src/WalletTransaction.cpp @@ -11,7 +11,8 @@ #include -#include "UUID.h" +#include + #include "WalletTransaction.h"