From c6bb371b4bce8163bfac2b77a9a7e0f7cb9ad4bc Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 11 Mar 2014 15:28:14 +0100 Subject: fix warning Change-Id: I7afedbf679ae1c8467eea749e79eb10f2516d039 Reviewed-by: Oliver Wolff Reviewed-by: Andrew Knight --- src/network/socket/qlocalserver_tcp.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/network/socket') diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp index 39e7babf71..de4acd9111 100644 --- a/src/network/socket/qlocalserver_tcp.cpp +++ b/src/network/socket/qlocalserver_tcp.cpp @@ -80,8 +80,6 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName) bool QLocalServerPrivate::listen(qintptr socketDescriptor) { - Q_Q(QLocalServer); - return tcpServer.setSocketDescriptor(socketDescriptor); } -- cgit v1.2.3 From 04a632c88a243fb0caac6fc0c71288210c18232e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 11 Mar 2014 15:28:35 +0100 Subject: fix namespaced WinRT build Change-Id: I613a737600f85ef90155e3b8647197b4fd092998 Reviewed-by: Andrew Knight Reviewed-by: Oliver Wolff --- src/network/socket/qnativesocketengine_winrt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/network/socket') diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp index 2a61325471..4b2d1c372e 100644 --- a/src/network/socket/qnativesocketengine_winrt.cpp +++ b/src/network/socket/qnativesocketengine_winrt.cpp @@ -549,9 +549,9 @@ qint64 QNativeSocketEngine::write(const char *data, qint64 len) Q_D(QNativeSocketEngine); qint64 bytesWritten = -1; if (d->socketType == QAbstractSocket::TcpSocket) - bytesWritten = ::nativeWrite(d->tcp, data, len); + bytesWritten = nativeWrite(d->tcp, data, len); else if (d->socketType == QAbstractSocket::UdpSocket) - bytesWritten = ::nativeWrite(d->udp, data, len); + bytesWritten = nativeWrite(d->udp, data, len); if (bytesWritten != -1 && d->notifyOnWrite) writeNotification(); return bytesWritten; -- cgit v1.2.3 From df757e30f816bee8bed5f65ff8e63cec57fe46b1 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 12 Mar 2014 14:07:44 +0100 Subject: Fix compilation with QNATIVESOCKETENGINE_DEBUG enabled Change-Id: Ie60b70aaa1fe11de613ba99427be00e307b6769d Reviewed-by: Peter Hartmann --- src/network/socket/qnativesocketengine_unix.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/network/socket') diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index b6035b5500..b1b19528c2 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -363,7 +363,7 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 port) { #ifdef QNATIVESOCKETENGINE_DEBUG - qDebug("QNativeSocketEnginePrivate::nativeConnect() : %d ", socketDescriptor); + qDebug("QNativeSocketEnginePrivate::nativeConnect() : %lli", socketDescriptor); #endif struct sockaddr_in sockAddrIPv4; @@ -847,7 +847,7 @@ qint64 QNativeSocketEnginePrivate::nativePendingDatagramSize() const } #if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QNativeSocketEnginePrivate::nativePendingDatagramSize() == %i", recvResult); + qDebug("QNativeSocketEnginePrivate::nativePendingDatagramSize() == %zd", recvResult); #endif return qint64(recvResult); @@ -1012,13 +1012,13 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() socketType = QAbstractSocket::UnknownSocketType; } #if defined (QNATIVESOCKETENGINE_DEBUG) - QString socketProtocolStr = "UnknownProtocol"; - if (socketProtocol == QAbstractSocket::IPv4Protocol) socketProtocolStr = "IPv4Protocol"; - else if (socketProtocol == QAbstractSocket::IPv6Protocol) socketProtocolStr = "IPv6Protocol"; + QString socketProtocolStr = QStringLiteral("UnknownProtocol"); + if (socketProtocol == QAbstractSocket::IPv4Protocol) socketProtocolStr = QStringLiteral("IPv4Protocol"); + else if (socketProtocol == QAbstractSocket::IPv6Protocol) socketProtocolStr = QStringLiteral("IPv6Protocol"); - QString socketTypeStr = "UnknownSocketType"; - if (socketType == QAbstractSocket::TcpSocket) socketTypeStr = "TcpSocket"; - else if (socketType == QAbstractSocket::UdpSocket) socketTypeStr = "UdpSocket"; + QString socketTypeStr = QStringLiteral("UnknownSocketType"); + if (socketType == QAbstractSocket::TcpSocket) socketTypeStr = QStringLiteral("TcpSocket"); + else if (socketType == QAbstractSocket::UdpSocket) socketTypeStr = QStringLiteral("UdpSocket"); qDebug("QNativeSocketEnginePrivate::fetchConnectionParameters() local == %s:%i," " peer == %s:%i, socket == %s - %s", @@ -1112,7 +1112,7 @@ qint64 QNativeSocketEnginePrivate::nativeRead(char *data, qint64 maxSize) } #if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QNativeSocketEnginePrivate::nativeRead(%p \"%s\", %llu) == %i", + qDebug("QNativeSocketEnginePrivate::nativeRead(%p \"%s\", %llu) == %zd", data, qt_prettyDebug(data, qMin(r, ssize_t(16)), r).data(), maxSize, r); #endif -- cgit v1.2.3 From 53f81ac946d69bcd68a02620bf52dc42fcdcc506 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 19 Feb 2014 12:15:00 +0100 Subject: BlackBerry networking: call special select() method ... so that the socket notifiers are enabled after selecting and thus emit signals even after selecting (select() is called e.g. by the waitFor* methods). Task-number: QTBUG-36144 Change-Id: I385f288e8c42f92a9c84e53bce843e52f8094ada Reviewed-by: Kevin Krammer Reviewed-by: Rafael Roquetto Reviewed-by: Fanda Vacek Reviewed-by: Bernd Weimer Reviewed-by: Richard J. Moore --- src/network/socket/qnativesocketengine_unix.cpp | 48 +++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'src/network/socket') diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index b1b19528c2..6ee8b696df 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -1120,6 +1120,53 @@ qint64 QNativeSocketEnginePrivate::nativeRead(char *data, qint64 maxSize) return qint64(r); } +#ifdef Q_OS_BLACKBERRY +int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) const +{ + fd_set fds; + FD_ZERO(&fds); + FD_SET(socketDescriptor, &fds); + + int retval; + QList notifiers; + if (selectForRead) { + notifiers << readNotifier; + retval = bb_select(notifiers, socketDescriptor + 1, &fds, 0, timeout); + } else { + notifiers << writeNotifier; + retval = bb_select(notifiers, socketDescriptor + 1, 0, &fds, timeout); + } + + return retval; +} + +int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool checkWrite, + bool *selectForRead, bool *selectForWrite) const +{ + fd_set fdread; + FD_ZERO(&fdread); + if (checkRead) + FD_SET(socketDescriptor, &fdread); + + fd_set fdwrite; + FD_ZERO(&fdwrite); + if (checkWrite) + FD_SET(socketDescriptor, &fdwrite); + + QList notifiers; + notifiers << readNotifier << writeNotifier; + int ret = bb_select(notifiers, socketDescriptor + 1, &fdread, &fdwrite, timeout); + + if (ret <= 0) + return ret; + *selectForRead = FD_ISSET(socketDescriptor, &fdread); + *selectForWrite = FD_ISSET(socketDescriptor, &fdwrite); + + return ret; +} + +#else // not Q_OS_BLACKBERRY: + int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) const { fd_set fds; @@ -1166,5 +1213,6 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool c return ret; } +#endif // Q_OS_BLACKBERRY QT_END_NAMESPACE -- cgit v1.2.3