diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2010-12-07 16:23:15 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2010-12-07 16:35:34 (GMT) |
| commit | c2f9ec2ae225fbaeaa0e463308427fb075d9c2af (patch) | |
| tree | 4de690e1a8d5dedf5ba68142687dff6c68af8319 /src | |
| parent | f16b745ca427e75bc045076f5e14742a2a2c713a (diff) | |
| download | Qt-c2f9ec2ae225fbaeaa0e463308427fb075d9c2af.zip Qt-c2f9ec2ae225fbaeaa0e463308427fb075d9c2af.tar.gz Qt-c2f9ec2ae225fbaeaa0e463308427fb075d9c2af.tar.bz2 | |
QSymbianSocketEngine: Get global RConnection*
Reviewed-by: Shane Kearns
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/socket/qsymbiansocketengine.cpp | 3 | ||||
| -rw-r--r-- | src/network/socket/qsymbiansocketengine_p.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/network/socket/qsymbiansocketengine.cpp b/src/network/socket/qsymbiansocketengine.cpp index 7a22918..55fe12b 100644 --- a/src/network/socket/qsymbiansocketengine.cpp +++ b/src/network/socket/qsymbiansocketengine.cpp @@ -145,7 +145,7 @@ bool QSymbianSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType so #endif TUint type = (socketType == QAbstractSocket::UdpSocket) ? KSockDatagram : KSockStream; TUint protocol = (socketType == QAbstractSocket::UdpSocket) ? KProtocolInetUdp : KProtocolInetTcp; - TInt err = nativeSocket.Open(socketServer, family, type, protocol, connection); + TInt err = nativeSocket.Open(socketServer, family, type, protocol, *connection); if (err != KErrNone) { switch (err) { @@ -262,6 +262,7 @@ void QSymbianSocketEnginePrivate::setPortAndAddress(TInetAddr& nativeAddr, quint QSymbianSocketEnginePrivate::QSymbianSocketEnginePrivate() : socketDescriptor(-1), socketServer(qt_symbianGetSocketServer()), + connection(QSymbianSocketManager::instance().defaultConnection()), readNotifier(0), writeNotifier(0), exceptNotifier(0) diff --git a/src/network/socket/qsymbiansocketengine_p.h b/src/network/socket/qsymbiansocketengine_p.h index 07e1b69..fd449ca 100644 --- a/src/network/socket/qsymbiansocketengine_p.h +++ b/src/network/socket/qsymbiansocketengine_p.h @@ -156,8 +156,10 @@ public: int socketDescriptor; #ifdef Q_OS_SYMBIAN mutable RSocket nativeSocket; + // From QtCore: RSocketServ& socketServer; - RConnection connection; //TODO: shared ref + // From QtCore, check lifetime issues, also should be pulling this out of a QNetworkSession somehow: + RConnection *connection; mutable RTimer selectTimer; #endif |