prefer typename to class for templates

This commit is contained in:
Stephen Birarda 2015-07-08 18:58:35 -07:00
parent 658ad6bd02
commit 8f900d22ca
2 changed files with 7 additions and 7 deletions

View file

@ -15,13 +15,13 @@
#include "NLPacket.h" #include "NLPacket.h"
template <class T> PacketList<T>::PacketList(PacketType::Value packetType) : template <typename T> PacketList<T>::PacketList(PacketType::Value packetType) :
_packetType(packetType) _packetType(packetType)
{ {
} }
template <class T> std::unique_ptr<NLPacket> PacketList<T>::createPacketWithExtendedHeader() { template <typename T> std::unique_ptr<NLPacket> PacketList<T>::createPacketWithExtendedHeader() {
// use the static create method to create a new packet // use the static create method to create a new packet
auto packet = T::create(_packetType); auto packet = T::create(_packetType);
@ -32,16 +32,16 @@ template <class T> std::unique_ptr<NLPacket> PacketList<T>::createPacketWithExte
} }
} }
template<class T> template<typename U> qint64 PacketList<T>::readPrimitive(U* data) { template <typename T> template <typename U> qint64 PacketList<T>::readPrimitive(U* data) {
return QIODevice::read(reinterpret_cast<char*>(data), sizeof(U)); return QIODevice::read(reinterpret_cast<char*>(data), sizeof(U));
} }
template<class T> template<typename U> qint64 PacketList<T>::writePrimitive(const U& data) { template <typename T> template<typename U> qint64 PacketList<T>::writePrimitive(const U& data) {
static_assert(!std::is_pointer<U>::value, "T must not be a pointer"); static_assert(!std::is_pointer<U>::value, "T must not be a pointer");
return QIODevice::write(reinterpret_cast<const char*>(&data), sizeof(U)); return QIODevice::write(reinterpret_cast<const char*>(&data), sizeof(U));
} }
template <class T> qint64 PacketList<T>::writeData(const char* data, qint64 maxSize) { template <typename T> qint64 PacketList<T>::writeData(const char* data, qint64 maxSize) {
if (!_currentPacket) { if (!_currentPacket) {
// we don't have a current packet, time to set one up // we don't have a current packet, time to set one up
_currentPacket = createPacketWithExtendedHeader(); _currentPacket = createPacketWithExtendedHeader();
@ -112,7 +112,7 @@ template <class T> qint64 PacketList<T>::writeData(const char* data, qint64 maxS
} }
} }
template <class T> void PacketList<T>::closeCurrentPacket() { template <typename T> void PacketList<T>::closeCurrentPacket() {
// move the current packet to our list of packets // move the current packet to our list of packets
_packets.insert(std::move(_currentPacket)); _packets.insert(std::move(_currentPacket));
} }

View file

@ -18,7 +18,7 @@
class NLPacket; class NLPacket;
template <class T> class PacketList : public QIODevice { template <typename T> class PacketList : public QIODevice {
public: public:
PacketList(PacketType::Value packetType); PacketList(PacketType::Value packetType);