Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-15 20:59:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix for registration of meta types in Socket

Browse source
This commit is contained in:
Stephen Birarda 2015-10-08 18:17:24 -07:00
parent 9d949da19c
commit 1cd76bb937
5 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClient.cpp
View file

@ -39,8 +39,6 @@
const QString ASSIGNMENT_CLIENT_TARGET_NAME = "assignment-client"; const QString ASSIGNMENT_CLIENT_TARGET_NAME = "assignment-client";
const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000; const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000;
int hifiSockAddrMeta = qRegisterMetaType<HifiSockAddr>("HifiSockAddr");
AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool, AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool,
quint16 listenPort, QUuid walletUUID, QString assignmentServerHostname, quint16 listenPort, QUuid walletUUID, QString assignmentServerHostname,
quint16 assignmentServerPort, quint16 assignmentMonitorPort) : quint16 assignmentServerPort, quint16 assignmentMonitorPort) :

2
libraries/networking/src/HifiSockAddr.cpp
View file

@ -16,7 +16,7 @@
#include "HifiSockAddr.h" #include "HifiSockAddr.h"
#include "NetworkLogging.h" #include "NetworkLogging.h"
static int hifiSockAddrMetaTypeId = qMetaTypeId<HifiSockAddr>(); static int hifiSockAddrMetaTypeId = qRegisterMetaType<HifiSockAddr>();
HifiSockAddr::HifiSockAddr() : HifiSockAddr::HifiSockAddr() :
_address(), _address(),

2
libraries/networking/src/HifiSockAddr.h
View file

@ -94,6 +94,6 @@ namespace std {
QHostAddress getLocalAddress(); QHostAddress getLocalAddress();
Q_DECLARE_METATYPE(HifiSockAddr) Q_DECLARE_METATYPE(HifiSockAddr);
#endif // hifi_HifiSockAddr_h #endif // hifi_HifiSockAddr_h

2
libraries/networking/src/LimitedNodeList.h
View file

@ -60,8 +60,6 @@ const QHostAddress DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME = QHostAddress::Lo
const QString USERNAME_UUID_REPLACEMENT_STATS_KEY = "$username"; const QString USERNAME_UUID_REPLACEMENT_STATS_KEY = "$username";
class HifiSockAddr;
using namespace tbb; using namespace tbb;
typedef std::pair<QUuid, SharedNodePointer> UUIDNodePair; typedef std::pair<QUuid, SharedNodePointer> UUIDNodePair;
typedef concurrent_unordered_map<QUuid, SharedNodePointer, UUIDHasher> NodeHash; typedef concurrent_unordered_map<QUuid, SharedNodePointer, UUIDHasher> NodeHash;

4
libraries/networking/src/udt/Socket.cpp
View file

@ -31,8 +31,8 @@ Socket::Socket(QObject* parent) :
QObject(parent), QObject(parent),
_synTimer(new QTimer(this)) _synTimer(new QTimer(this))
{ {
qRegisterMetaType<Packet*>(); qRegisterMetaType<Packet*>("Packet*");
qRegisterMetaType<PacketList*>(); qRegisterMetaType<PacketList*>("PacketList*");
connect(&_udpSocket, &QUdpSocket::readyRead, this, &Socket::readPendingDatagrams); connect(&_udpSocket, &QUdpSocket::readyRead, this, &Socket::readPendingDatagrams);