diff options
author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-01 14:20:19 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-14 18:41:17 +0100 |
commit | 4329030b77dc2faf267cecc0a8b03ce3ed3437cf (patch) | |
tree | 3c543ff088b626b3aaa5b58826b7e595776d82ca /src/network/socket/qlocalsocket_unix.cpp | |
parent | 49bd825a9626eda77fd9e8313e1868bed4c77bff (diff) |
network: remove Symbian specific code
removes several files and cleans up the code, removing all Symbian
specific #ifdef's etc.
Change-Id: Ie457e54cb4b3a992f251383320d47822259c38f1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/socket/qlocalsocket_unix.cpp')
-rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 7c2a8f3162..1bdf604eb1 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -242,7 +242,6 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) QLatin1String("QLocalSocket::connectToServer")); return; } -#ifndef Q_OS_SYMBIAN // set non blocking so we can try to connect and it wont wait int flags = fcntl(d->connectingSocket, F_GETFL, 0); if (-1 == flags @@ -251,7 +250,6 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) QLatin1String("QLocalSocket::connectToServer")); return; } -#endif // _q_connectToSocket does the actual connecting d->connectingName = name; @@ -538,14 +536,7 @@ bool QLocalSocket::waitForConnected(int msec) timer.start(); while (state() == ConnectingState && (-1 == msec || timer.elapsed() < msec)) { -#ifdef Q_OS_SYMBIAN - // On Symbian, ready-to-write is signaled when non-blocking socket - // connect is finised. Is ready-to-read really used on other - // UNIX paltforms when using non-blocking AF_UNIX socket? - result = ::select(d->connectingSocket + 1, 0, &fds, 0, &timeout); -#else result = ::select(d->connectingSocket + 1, &fds, 0, 0, &timeout); -#endif if (-1 == result && errno != EINTR) { d->errorOccurred( QLocalSocket::UnknownSocketError, QLatin1String("QLocalSocket::waitForConnected")); |