From 1cd76bb93778f52b970d2aa1d16a557d1c5a8980 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 8 Oct 2015 18:17:24 -0700
Subject: [PATCH] fix for registration of meta types in Socket

---
 assignment-client/src/AssignmentClient.cpp | 2 --
 libraries/networking/src/HifiSockAddr.cpp  | 2 +-
 libraries/networking/src/HifiSockAddr.h    | 2 +-
 libraries/networking/src/LimitedNodeList.h | 2 --
 libraries/networking/src/udt/Socket.cpp    | 4 ++--
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 708589c32f..f4f98114d0 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -39,8 +39,6 @@
 const QString ASSIGNMENT_CLIENT_TARGET_NAME = "assignment-client";
 const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000;
 
-int hifiSockAddrMeta = qRegisterMetaType<HifiSockAddr>("HifiSockAddr");
-
 AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool,
                                    quint16 listenPort, QUuid walletUUID, QString assignmentServerHostname,
                                    quint16 assignmentServerPort, quint16 assignmentMonitorPort) :
diff --git a/libraries/networking/src/HifiSockAddr.cpp b/libraries/networking/src/HifiSockAddr.cpp
index 7774cdd93c..e6c2f2985a 100644
--- a/libraries/networking/src/HifiSockAddr.cpp
+++ b/libraries/networking/src/HifiSockAddr.cpp
@@ -16,7 +16,7 @@
 #include "HifiSockAddr.h"
 #include "NetworkLogging.h"
 
-static int hifiSockAddrMetaTypeId = qMetaTypeId<HifiSockAddr>();
+static int hifiSockAddrMetaTypeId = qRegisterMetaType<HifiSockAddr>();
 
 HifiSockAddr::HifiSockAddr() :
     _address(),
diff --git a/libraries/networking/src/HifiSockAddr.h b/libraries/networking/src/HifiSockAddr.h
index d678f93ac0..cb5d0acc12 100644
--- a/libraries/networking/src/HifiSockAddr.h
+++ b/libraries/networking/src/HifiSockAddr.h
@@ -94,6 +94,6 @@ namespace std {
 
 QHostAddress getLocalAddress();
 
-Q_DECLARE_METATYPE(HifiSockAddr)
+Q_DECLARE_METATYPE(HifiSockAddr);
 
 #endif // hifi_HifiSockAddr_h
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 40c5390c7e..2488b0cf8c 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -60,8 +60,6 @@ const QHostAddress DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME = QHostAddress::Lo
 
 const QString USERNAME_UUID_REPLACEMENT_STATS_KEY = "$username";
 
-class HifiSockAddr;
-
 using namespace tbb;
 typedef std::pair<QUuid, SharedNodePointer> UUIDNodePair;
 typedef concurrent_unordered_map<QUuid, SharedNodePointer, UUIDHasher> NodeHash;
diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index 50f2e67007..bc34c6e294 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -31,8 +31,8 @@ Socket::Socket(QObject* parent) :
     QObject(parent),
     _synTimer(new QTimer(this))
 {
-    qRegisterMetaType<Packet*>();
-    qRegisterMetaType<PacketList*>();
+    qRegisterMetaType<Packet*>("Packet*");
+    qRegisterMetaType<PacketList*>("PacketList*");
     
     connect(&_udpSocket, &QUdpSocket::readyRead, this, &Socket::readPendingDatagrams);