From 0d1984357f9bc8aac671e8907208a8581a1f42db Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 26 Jul 2018 16:11:31 +0200
Subject: [*] Convert old C-Style casts

Primitive types now use type(x) instead of (type)x,
pointers should use appropriate long versions
---
 src/shared/networkmessage.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/networkmessage.cpp b/src/shared/networkmessage.cpp
index 0bdf3c5..3c6a687 100644
--- a/src/shared/networkmessage.cpp
+++ b/src/shared/networkmessage.cpp
@@ -26,14 +26,14 @@ static quint16 _htons(const quint16 x)
 {
 	if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
 		return x;
-	return (quint16)BYTE_SWAP2(x);
+	return quint16(BYTE_SWAP2(x));
 }
 
 static quint32 _htonl(const quint32 x)
 {
 	if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
 		return x;
-	return (quint32)BYTE_SWAP4(x);
+	return quint32(BYTE_SWAP4(x));
 }
 
 static quint16 _ntohs(const char *in)
@@ -106,10 +106,10 @@ int NetworkMessage::readMessage(QAbstractSocket* socket)
 			const qint64 ret = socket->read(_buffer + _bufferPos, _bufferSize - _bufferPos);
 			//qDebug() << "Read " << ret << " bytes";
 			if (ret < 0 || ret > (_bufferSize - _bufferPos)) {
-				qDebug("Socket read failed (TCP), return code %d", (int)ret);
+				qDebug("Socket read failed (TCP), return code %d", int(ret));
 				return NM_READ_FAILED;
 			}
-			_bufferPos += (quint32)ret;
+			_bufferPos += quint32(ret);
 			//qDebug() << "Buffer has now " << _bufferPos << " of " << _bufferSize << " bytes";
 		}
 		if (_bufferSize == _bufferPos) {
@@ -137,7 +137,7 @@ int NetworkMessage::readMessage(char* data, quint32 len)
 	if (!this->parseHeader(data))
 		return NM_READ_FAILED;
 	if (len != _bufferSize + HEADER_LEN) {
-		qDebug("UDP packet has wrong size. Is %d, expected %d", (int)_bufferSize, len - HEADER_LEN);
+		qDebug("UDP packet has wrong size. Is %d, expected %d", int(_bufferSize), len - HEADER_LEN);
 		return NM_READ_FAILED;
 	}
 	return this->parseMessage(data + HEADER_LEN) ? NM_READ_OK : NM_READ_FAILED;
@@ -202,7 +202,7 @@ bool NetworkMessage::writeMessage(QAbstractSocket * const socket)
 		return true;
 	if (ret < 0 || ret > (_bufferSize - _bufferPos))
 		return false;
-	_bufferPos += (quint32)ret;
+	_bufferPos += quint32(ret);
 	if (_bufferPos == _bufferSize) {
 		_bufferPos = 0;
 		_mode = 4;
@@ -241,11 +241,11 @@ void NetworkMessage::serializeMessage()
 	for (QHash<QByteArray, QByteArray>::const_iterator it = _fields.begin(); it != _fields.end(); ++it) {
 		const QByteArray &ba = it.key();
 		const QByteArray &val = it.value();
-		quint16 keyLen = _htons((quint16)ba.size());
-		quint16 valLen = _htons((quint16)val.size());
+		quint16 keyLen = _htons(quint16(ba.size()));
+		quint16 valLen = _htons(quint16(val.size()));
 		//qDebug() << "Adding to msg(" << ba.size() << "/" << val.size() << "): " << ba << " -> " << val;
-		buf.append((char*)&keyLen, 2);
-		buf.append((char*)&valLen, 2);
+		buf.append(reinterpret_cast<const char*>(&keyLen), 2);
+		buf.append(reinterpret_cast<const char*>(&valLen), 2);
 		buf.append(ba);
 		buf.append(val);
 	}
-- 
cgit v1.2.3-55-g7522