diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-06-30 13:52:57 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-06-30 14:14:02 (GMT) |
| commit | acfa2ac5ff4cae931e873c8bdc41277bf99f2c1b (patch) | |
| tree | ae84566de76f83029460b2afa516bf5b4460b149 /src/network | |
| parent | 255c648cf291fa23f64be2c7a74ffdbeb94e84e0 (diff) | |
| download | Qt-acfa2ac5ff4cae931e873c8bdc41277bf99f2c1b.zip Qt-acfa2ac5ff4cae931e873c8bdc41277bf99f2c1b.tar.gz Qt-acfa2ac5ff4cae931e873c8bdc41277bf99f2c1b.tar.bz2 | |
Symbian socket engine: remove remaining todo comments
The writes >16k blocking in the emulator only applies to the winsock
connectivity used in S60 SDKs. It doesn't affect the ethernet
connectivity used by platform environments.
Restarting notifier after error seems like the correct thing to do,
and isn't causing any problems.
The duplicated code for setting error strings is unfortunate, but a
consequence of our decision not to derive from the native socket engine.
If symbian ever gets a Qt5 port, we should revisit it there.
Task-number: QTBUG-18371
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qsymbiansocketengine.cpp | 6 | ||||
| -rw-r--r-- | src/network/socket/qsymbiansocketengine_p.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/network/socket/qsymbiansocketengine.cpp b/src/network/socket/qsymbiansocketengine.cpp index edd5d6e..0aa5a5a 100644 --- a/src/network/socket/qsymbiansocketengine.cpp +++ b/src/network/socket/qsymbiansocketengine.cpp @@ -1037,7 +1037,7 @@ qint64 QSymbianSocketEngine::write(const char *data, qint64 len) TSockXfrLength sentBytes = 0; TRequestStatus status; d->nativeSocket.Send(buffer, 0, status, sentBytes); - User::WaitForRequest(status); //TODO: on emulator this blocks for write >16kB (non blocking IO not implemented properly?) + User::WaitForRequest(status); TInt err = status.Int(); if (err) { @@ -1204,7 +1204,7 @@ int QSymbianSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool const_cast<QSymbianSocketEnginePrivate*>(this)->setError(err); //restart asynchronous notifier (only one IOCTL allowed at a time) if (asyncSelect) - asyncSelect->IssueRequest(); //TODO: in error case should we restart or not? + asyncSelect->IssueRequest(); return err; } if (checkRead && (selectFlags() & KSockSelectRead)) { @@ -1324,7 +1324,7 @@ bool QSymbianSocketEnginePrivate::checkProxy(const QHostAddress &address) return true; } -// FIXME this is also in QNativeSocketEngine, unify it +// ### this is also in QNativeSocketEngine, unify it /*! \internal Sets the error and error string if not set already. The only diff --git a/src/network/socket/qsymbiansocketengine_p.h b/src/network/socket/qsymbiansocketengine_p.h index 3b39096..aad6228 100644 --- a/src/network/socket/qsymbiansocketengine_p.h +++ b/src/network/socket/qsymbiansocketengine_p.h @@ -195,7 +195,6 @@ public: mutable QByteArray receivedDataBuffer; mutable bool hasReceivedBufferedDatagram; - // FIXME this is duplicated from qnativesocketengine_p.h enum ErrorString { NonBlockingInitFailedErrorString, BroadcastingInitFailedErrorString, |