Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move qdeclare/qregister calls to their respective class header

Browse source
This commit is contained in:
Ryan Huffman 2015-10-09 09:58:32 -07:00
parent 4dddb508a8
commit 21e9d30bbe
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/udt/Packet.cpp
View file

@ -13,6 +13,8 @@
using namespace udt; using namespace udt;
static int packetMetaTypeId = qRegisterMetaType<Packet*>("Packet*");
int Packet::localHeaderSize(bool isPartOfMessage) { int Packet::localHeaderSize(bool isPartOfMessage) {
return sizeof(Packet::SequenceNumberAndBitField) + return sizeof(Packet::SequenceNumberAndBitField) +
(isPartOfMessage ? sizeof(Packet::MessageNumberAndBitField) + sizeof(MessagePartNumber) : 0); (isPartOfMessage ? sizeof(Packet::MessageNumberAndBitField) + sizeof(MessagePartNumber) : 0);

2
libraries/networking/src/udt/Packet.h
View file

@ -91,4 +91,6 @@ private:
} // namespace udt } // namespace udt
Q_DECLARE_METATYPE(udt::Packet*);
#endif // hifi_Packet_h #endif // hifi_Packet_h

2
libraries/networking/src/udt/PacketList.cpp
View file

@ -15,6 +15,8 @@
using namespace udt; using namespace udt;
static int packetListMetaTypeId = qRegisterMetaType<PacketList*>("PacketList*");
std::unique_ptr<PacketList> PacketList::create(PacketType packetType, QByteArray extendedHeader, std::unique_ptr<PacketList> PacketList::create(PacketType packetType, QByteArray extendedHeader,
bool isReliable, bool isOrdered) { bool isReliable, bool isOrdered) {
auto packetList = std::unique_ptr<PacketList>(new PacketList(packetType, extendedHeader, auto packetList = std::unique_ptr<PacketList>(new PacketList(packetType, extendedHeader,

2
libraries/networking/src/udt/PacketList.h
View file

@ -118,4 +118,6 @@ template<typename T> std::unique_ptr<T> PacketList::takeFront() {
} }
Q_DECLARE_METATYPE(udt::PacketList*);
#endif // hifi_PacketList_h #endif // hifi_PacketList_h

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

@ -24,16 +24,10 @@
using namespace udt; using namespace udt;
Q_DECLARE_METATYPE(Packet*);
Q_DECLARE_METATYPE(PacketList*);
Socket::Socket(QObject* parent) : Socket::Socket(QObject* parent) :
QObject(parent), QObject(parent),
_synTimer(new QTimer(this)) _synTimer(new QTimer(this))
{ {
qRegisterMetaType<Packet*>("Packet*");
qRegisterMetaType<PacketList*>("PacketList*");
connect(&_udpSocket, &QUdpSocket::readyRead, this, &Socket::readPendingDatagrams); connect(&_udpSocket, &QUdpSocket::readyRead, this, &Socket::readPendingDatagrams);
// make sure our synchronization method is called every SYN interval // make sure our synchronization method is called every SYN interval