From 956b21557d0d6e119133b1d8173b00f1ba11f495 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Tue, 18 Aug 2009 11:58:38 +0200 Subject: Trivial coding style related change. --- src/network/socket/qabstractsocket.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index c38152a..347fb72 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1067,9 +1067,9 @@ void QAbstractSocketPrivate::_q_abortConnectionAttempt() #if defined(QABSTRACTSOCKET_DEBUG) qDebug("QAbstractSocketPrivate::_q_abortConnectionAttempt() (timed out)"); #endif - if (socketEngine) { + if (socketEngine) socketEngine->setWriteNotificationEnabled(false); - } + connectTimer->stop(); if (addresses.isEmpty()) { -- cgit v0.12 From dcc7ddb73396d1024e0b5246d2c6e3046c66dc40 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Tue, 18 Aug 2009 12:43:26 +0200 Subject: Trivial, followng the Qt coding style. --- src/network/socket/qnativesocketengine_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h index 8f08365..6b1e8c3 100644 --- a/src/network/socket/qnativesocketengine_p.h +++ b/src/network/socket/qnativesocketengine_p.h @@ -62,7 +62,7 @@ #ifdef Q_OS_SYMBIAN #include -#include +#include #endif QT_BEGIN_NAMESPACE -- cgit v0.12 From ead9206ce6c10368a0cef16aab68669aef845d55 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Tue, 18 Aug 2009 13:03:04 +0200 Subject: No need for logging line. Return of -1 is valid and happens quite often. --- src/network/socket/qnativesocketengine_unix.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index cf31832..efcaefd 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -673,9 +673,6 @@ bool QNativeSocketEnginePrivate::nativeListen(int backlog) int QNativeSocketEnginePrivate::nativeAccept() { int acceptedDescriptor = qt_safe_accept(socketDescriptor, 0, 0); -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QNativeSocketEnginePrivate::nativeAccept() == %i", acceptedDescriptor); -#endif //check if we have vaild descriptor at all if(acceptedDescriptor > 0) { -- cgit v0.12