diff options
| -rw-r--r-- | src/plugins/bearer/symbian/qnetworksession_impl.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbianengine.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbianengine.h | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp index 7762fb5..9af1fe9 100644 --- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp +++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp @@ -322,7 +322,7 @@ void QNetworkSessionPrivateImpl::open() } newState(QNetworkSession::Connecting); } else if (publicConfig.type() == QNetworkConfiguration::UserChoice) { - iKnownConfigsBeforeConnectionStart = engine->accessPointConfigurations.keys(); + iKnownConfigsBeforeConnectionStart = engine->accessPointConfigurationIdentifiers(); iConnection.Start(iStatus); if (!IsActive()) { SetActive(); @@ -699,7 +699,7 @@ QNetworkConfiguration QNetworkSessionPrivateImpl::activeConfiguration(TUint32 ia // 1. Sync internal configurations array to commsdb first engine->updateConfigurations(); // 2. Check if new configuration was created during connection creation - QList<QString> knownConfigs = engine->accessPointConfigurations.keys(); + QStringList knownConfigs = engine->accessPointConfigurationIdentifiers(); if (knownConfigs.count() > iKnownConfigsBeforeConnectionStart.count()) { // Configuration count increased => new configuration was created // => Search new, created configuration diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp index 0331026..b3c9cb3 100644 --- a/src/plugins/bearer/symbian/symbianengine.cpp +++ b/src/plugins/bearer/symbian/symbianengine.cpp @@ -560,6 +560,13 @@ QNetworkConfigurationPrivatePointer SymbianEngine::defaultConfiguration() return ptr; } +QStringList SymbianEngine::accessPointConfigurationIdentifiers() +{ + QMutexLocker locker(&mutex); + + return accessPointConfigurations.keys(); +} + QNetworkConfigurationPrivatePointer SymbianEngine::defaultConfigurationL() { QMutexLocker locker(&mutex); diff --git a/src/plugins/bearer/symbian/symbianengine.h b/src/plugins/bearer/symbian/symbianengine.h index 587585b..5448813 100644 --- a/src/plugins/bearer/symbian/symbianengine.h +++ b/src/plugins/bearer/symbian/symbianengine.h @@ -42,6 +42,7 @@ #ifndef SYMBIANENGINE_H #define SYMBIANENGINE_H +#include <QtCore/qstringlist.h> #include <QtNetwork/private/qbearerengine_p.h> #include <QtNetwork/qnetworkconfigmanager.h> @@ -116,6 +117,8 @@ public: QNetworkConfigurationPrivatePointer defaultConfiguration(); + QStringList accessPointConfigurationIdentifiers(); + Q_SIGNALS: void onlineStateChanged(bool isOnline); |