From b71678dfdb5e7c86261a3f9fe5de010b02edd6c7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 17 Jul 2015 15:47:37 -0700 Subject: [PATCH] repair constructor that takes QByteArray in PacketList --- libraries/networking/src/NLPacketList.cpp | 8 +------- libraries/networking/src/NLPacketList.h | 3 +-- libraries/networking/src/udt/PacketList.cpp | 8 +------- libraries/networking/src/udt/PacketList.h | 3 +-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/libraries/networking/src/NLPacketList.cpp b/libraries/networking/src/NLPacketList.cpp index 5f3770b4a4..8c794cf5f8 100644 --- a/libraries/networking/src/NLPacketList.cpp +++ b/libraries/networking/src/NLPacketList.cpp @@ -13,13 +13,7 @@ #include "NLPacket.h" -NLPacketList::NLPacketList(PacketType::Value packetType) : - PacketList(packetType) -{ - -} - -NLPacketList::NLPacketList(PacketType::Value packetType, const QByteArray& extendedHeader) : +NLPacketList::NLPacketList(PacketType::Value packetType, QByteArray extendedHeader) : PacketList(packetType, extendedHeader) { diff --git a/libraries/networking/src/NLPacketList.h b/libraries/networking/src/NLPacketList.h index 57581e8e12..28fbde9112 100644 --- a/libraries/networking/src/NLPacketList.h +++ b/libraries/networking/src/NLPacketList.h @@ -16,8 +16,7 @@ class NLPacketList : public PacketList { public: - NLPacketList(PacketType::Value packetType); - NLPacketList(PacketType::Value packetType, const QByteArray& extendedHeader); + NLPacketList(PacketType::Value packetType, QByteArray extendedHeader = QByteArray()); private: NLPacketList(const NLPacketList& other) = delete; diff --git a/libraries/networking/src/udt/PacketList.cpp b/libraries/networking/src/udt/PacketList.cpp index e988afd9a3..5dcacfa9b1 100644 --- a/libraries/networking/src/udt/PacketList.cpp +++ b/libraries/networking/src/udt/PacketList.cpp @@ -15,13 +15,7 @@ #include "Packet.h" -PacketList::PacketList(PacketType::Value packetType) : - _packetType(packetType) -{ - -} - -PacketList::PacketList(PacketType::Value packetType, const QByteArray& extendedHeader) : +PacketList::PacketList(PacketType::Value packetType, QByteArray extendedHeader) : _packetType(packetType), _extendedHeader(extendedHeader) { diff --git a/libraries/networking/src/udt/PacketList.h b/libraries/networking/src/udt/PacketList.h index 2e1413d66b..5ab3029a60 100644 --- a/libraries/networking/src/udt/PacketList.h +++ b/libraries/networking/src/udt/PacketList.h @@ -21,8 +21,7 @@ class Packet; class PacketList : public QIODevice { Q_OBJECT public: - PacketList(PacketType::Value packetType); - PacketList(PacketType::Value packetType, const QByteArray& extendedHeader); + PacketList(PacketType::Value packetType, QByteArray extendedHeader = QByteArray()); virtual bool isSequential() const { return true; }