diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2018-08-13 13:51:53 +0200 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2018-08-14 08:30:28 +0000 |
| commit | 1ea6c5a033f5f93bdefcaced5e5ee797de23ddef (patch) | |
| tree | bc91e178bbb2f3a04500994d1fcb2668aa2c5b5b /src/websockets/qwebsocket_p.cpp | |
| parent | 5425435759242367fb40f90c4aef5af3e24e2854 (diff) | |
| download | qtwebsockets-1ea6c5a033f5f93bdefcaced5e5ee797de23ddef.tar.gz | |
Fix conversion warnings
Change-Id: I087b72412db19f34b8e890ddc6a3a0fcdd434141
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index f005c17..fe6c565 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -341,10 +341,10 @@ void QWebSocketPrivate::close(QWebSocketProtocol::CloseCode closeCode, QString r quint32 maskingKey = 0; if (m_mustMask) { maskingKey = generateMaskingKey(); - QWebSocketProtocol::mask(payload.data(), payload.size(), maskingKey); + QWebSocketProtocol::mask(payload.data(), quint64(payload.size()), maskingKey); } QByteArray frame = getFrameHeader(QWebSocketProtocol::OpCodeClose, - payload.size(), maskingKey, true); + quint64(payload.size()), maskingKey, true); Q_ASSERT(payload.length() <= 125); frame.append(payload); @@ -431,7 +431,7 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask) #ifndef QT_NO_NETWORKPROXY sslSocket->setProxy(m_configuration.m_proxy); #endif - sslSocket->connectToHostEncrypted(url.host(), url.port(443)); + sslSocket->connectToHostEncrypted(url.host(), quint16(url.port(443))); } else { const QString message = QWebSocket::tr("Out of memory."); setErrorString(message); @@ -453,7 +453,7 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask) #ifndef QT_NO_NETWORKPROXY m_pSocket->setProxy(m_configuration.m_proxy); #endif - m_pSocket->connectToHost(url.host(), url.port(80)); + m_pSocket->connectToHost(url.host(), quint16(url.port(80))); } else { const QString message = QWebSocket::tr("Out of memory."); setErrorString(message); @@ -478,7 +478,8 @@ void QWebSocketPrivate::ping(const QByteArray &payload) quint32 maskingKey = 0; if (m_mustMask) maskingKey = generateMaskingKey(); - QByteArray pingFrame = getFrameHeader(QWebSocketProtocol::OpCodePing, payloadTruncated.size(), + QByteArray pingFrame = getFrameHeader(QWebSocketProtocol::OpCodePing, + quint64(payloadTruncated.size()), maskingKey, true); if (m_mustMask) QWebSocketProtocol::mask(&payloadTruncated, maskingKey); @@ -759,7 +760,7 @@ qint64 QWebSocketPrivate::doWriteFrames(const QByteArray &data, bool isBinary) const QWebSocketProtocol::OpCode firstOpCode = isBinary ? QWebSocketProtocol::OpCodeBinary : QWebSocketProtocol::OpCodeText; - int numFrames = data.size() / FRAME_SIZE_IN_BYTES; + int numFrames = data.size() / int(FRAME_SIZE_IN_BYTES); QByteArray tmpData(data); tmpData.detach(); char *payload = tmpData.data(); @@ -772,7 +773,7 @@ qint64 QWebSocketPrivate::doWriteFrames(const QByteArray &data, bool isBinary) if (Q_UNLIKELY(numFrames == 0)) numFrames = 1; quint64 currentPosition = 0; - quint64 bytesLeft = data.size(); + quint64 bytesLeft = quint64(data.size()); for (int i = 0; i < numFrames; ++i) { quint32 maskingKey = 0; @@ -1184,7 +1185,10 @@ void QWebSocketPrivate::processPing(const QByteArray &data) quint32 maskingKey = 0; if (m_mustMask) maskingKey = generateMaskingKey(); - m_pSocket->write(getFrameHeader(QWebSocketProtocol::OpCodePong, data.size(), maskingKey, true)); + m_pSocket->write(getFrameHeader(QWebSocketProtocol::OpCodePong, + unsigned(data.size()), + maskingKey, + true)); if (data.size() > 0) { QByteArray maskedData = data; if (m_mustMask) |