From 262d2cba12e9b164f9699951b37def21e1ed1652 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 26 May 2014 09:24:18 +0200 Subject: WinRT: Fix compile warnings Change-Id: If223dd73b9558a0f5144be38f19a61316f8c807b Reviewed-by: Oliver Wolff --- src/network/kernel/qhostaddress.cpp | 4 ++++ src/network/kernel/qhostinfo_winrt.cpp | 2 +- src/network/socket/qnativesocketengine_winrt.cpp | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/network') diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 0ab72191dc..1d38d06ae9 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -453,6 +453,8 @@ QHostAddress::QHostAddress(const struct sockaddr *sockaddr) setAddress(htonl(((sockaddr_in *)sockaddr)->sin_addr.s_addr)); else if (sockaddr->sa_family == AF_INET6) setAddress(((qt_sockaddr_in6 *)sockaddr)->sin6_addr.qt_s6_addr); +#else + Q_UNUSED(sockaddr) #endif } @@ -612,6 +614,8 @@ void QHostAddress::setAddress(const struct sockaddr *sockaddr) setAddress(htonl(((sockaddr_in *)sockaddr)->sin_addr.s_addr)); else if (sockaddr->sa_family == AF_INET6) setAddress(((qt_sockaddr_in6 *)sockaddr)->sin6_addr.qt_s6_addr); +#else + Q_UNUSED(sockaddr) #endif } diff --git a/src/network/kernel/qhostinfo_winrt.cpp b/src/network/kernel/qhostinfo_winrt.cpp index 928c9e4628..92897f563d 100644 --- a/src/network/kernel/qhostinfo_winrt.cpp +++ b/src/network/kernel/qhostinfo_winrt.cpp @@ -84,7 +84,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) HStringReference classId(RuntimeClass_Windows_Networking_HostName); if (FAILED(GetActivationFactory(classId.Get(), &hostnameFactory))) - Q_ASSERT(false, "Could not obtain hostname factory."); + Q_ASSERT_X(false, "QHostInfoAgent", "Could not obtain hostname factory."); IHostName *host; HStringReference hostNameRef((const wchar_t*)hostName.utf16()); diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp index db1d3dc96b..a32a757191 100644 --- a/src/network/socket/qnativesocketengine_winrt.cpp +++ b/src/network/socket/qnativesocketengine_winrt.cpp @@ -1159,7 +1159,7 @@ HRESULT QNativeSocketEnginePrivate::handleBindCompleted(IAsyncAction *, AsyncSta HRESULT QNativeSocketEnginePrivate::handleClientConnection(IStreamSocketListener *listener, IStreamSocketListenerConnectionReceivedEventArgs *args) { Q_Q(QNativeSocketEngine); - Q_ASSERT(tcpListener.Get() == listener); + Q_UNUSED(listener) IStreamSocket *socket; args->get_Socket(&socket); pendingConnections.append(socket); @@ -1253,7 +1253,7 @@ HRESULT QNativeSocketEnginePrivate::handleWriteCompleted(IAsyncOperationWithProg HRESULT QNativeSocketEnginePrivate::handleNewDatagram(IDatagramSocket *socket, IDatagramSocketMessageReceivedEventArgs *args) { Q_Q(QNativeSocketEngine); - Q_ASSERT(udp == socket); + Q_UNUSED(socket) pendingDatagrams.append(args); emit q->readReady(); -- cgit v1.2.3