diff options
Diffstat (limited to 'src/network/bearer')
| -rw-r--r-- | src/network/bearer/qnetworkconfigmanager.cpp | 2 | ||||
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 47 | ||||
| -rw-r--r-- | src/network/bearer/qnetworksession_p.h | 15 |
3 files changed, 2 insertions, 62 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp index 6c73828096..28bbafab36 100644 --- a/src/network/bearer/qnetworkconfigmanager.cpp +++ b/src/network/bearer/qnetworkconfigmanager.cpp @@ -200,7 +200,7 @@ QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate() works across multiple processes. If the platform session support is missing this API can only ensure the above behavior for network sessions within the same process. - In general mobile platforms (such as Symbian/S60) have such + In general mobile platforms have such support whereas most desktop platform lack this capability. \value ApplicationLevelRoaming The system gives applications control over the systems roaming behavior. Applications can initiate roaming (in case the diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index 5d2dd36950..f63298dba1 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -49,11 +49,6 @@ #include "qnetworkconfigmanager_p.h" #include "qnetworksession_p.h" -#ifdef Q_OS_SYMBIAN -#include <es_sock.h> -#include <private/qcore_symbian_p.h> -#endif - #ifndef QT_NO_BEARERMANAGEMENT QT_BEGIN_NAMESPACE @@ -362,9 +357,6 @@ void QNetworkSession::close() underlying network interface. This function always changes the session's state() flag to \l Disconnected. - On Symbian platform, a 'NetworkControl' capability is required for - full interface-level stop (without the capability, only the current session is stopped). - \sa open(), close() */ void QNetworkSession::stop() @@ -391,9 +383,6 @@ QNetworkConfiguration QNetworkSession::configuration() const The returned interface may change as a result of a roaming process. - Note: this function does not work in Symbian emulator due to the way the - connectivity is emulated on Windows. - \sa state() */ QNetworkInterface QNetworkSession::interface() const @@ -586,7 +575,7 @@ void QNetworkSession::migrate() */ void QNetworkSession::ignore() { - // Needed on at least Symbian platform: the roaming must be explicitly + // Needed on mobile platforms (was needed for Symbian/S60): the roaming must be explicitly // ignore()'d or migrate()'d if (d) d->ignore(); @@ -711,40 +700,6 @@ void QNetworkSession::disconnectNotify(const char *signal) d->setALREnabled(false); } -#ifdef Q_OS_SYMBIAN -RConnection* QNetworkSessionPrivate::nativeSession(QNetworkSession &s) -{ - if (!s.d) - return 0; - if (s.thread() != QThread::currentThread()) - qWarning("QNetworkSessionPrivate::nativeSession called in wrong thread"); - return s.d->nativeSession(); -} - -TInt QNetworkSessionPrivate::nativeOpenSocket(QNetworkSession& s, RSocket& sock, TUint family, TUint type, TUint protocol) -{ - if (!s.d) - return 0; - QMutexLocker lock(&(s.d->mutex)); - RConnection *con = s.d->nativeSession(); - if (!con || !con->SubSessionHandle()) - return KErrNotReady; - return sock.Open(qt_symbianGetSocketServer(), family, type, protocol, *con); -} - -TInt QNetworkSessionPrivate::nativeOpenHostResolver(QNetworkSession& s, RHostResolver& resolver, TUint family, TUint protocol) -{ - if (!s.d) - return 0; - QMutexLocker lock(&(s.d->mutex)); - RConnection *con = s.d->nativeSession(); - if (!con || !con->SubSessionHandle()) - return KErrNotReady; - return resolver.Open(qt_symbianGetSocketServer(), family, protocol, *con); -} - -#endif - #include "moc_qnetworksession.cpp" QT_END_NAMESPACE diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index cfd744479c..ddf0428b52 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/src/network/bearer/qnetworksession_p.h @@ -59,12 +59,6 @@ #ifndef QT_NO_BEARERMANAGEMENT -#ifdef Q_OS_SYMBIAN -class RConnection; -class RSocket; -class RHostResolver; -#endif - QT_BEGIN_NAMESPACE class Q_NETWORK_EXPORT QNetworkSessionPrivate : public QObject @@ -109,15 +103,6 @@ public: virtual quint64 bytesReceived() const = 0; virtual quint64 activeTime() const = 0; -#ifdef Q_OS_SYMBIAN - // get internal RConnection (not thread safe, call only from thread that owns the QNetworkSession) - static RConnection* nativeSession(QNetworkSession&); - virtual RConnection* nativeSession() = 0; - // open socket using the internal RConnection (thread safe) - static TInt nativeOpenSocket(QNetworkSession& session, RSocket& socket, TUint family, TUint type, TUint protocol); - // open host resolver using the internal RConnection (thread safe) - static TInt nativeOpenHostResolver(QNetworkSession& session, RHostResolver& resolver, TUint family, TUint protocol); -#endif protected: inline QNetworkConfigurationPrivatePointer privateConfiguration(const QNetworkConfiguration &config) const { |