diff -r 4ea83c148e84 -r 4203353e74ea qtmobility/src/bearer/qnetworkconfigmanager_s60_p.h --- a/qtmobility/src/bearer/qnetworkconfigmanager_s60_p.h Wed Jun 09 10:36:00 2010 +0300 +++ b/qtmobility/src/bearer/qnetworkconfigmanager_s60_p.h Mon Jun 21 16:36:26 2010 +0300 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -66,6 +66,9 @@ // Uncomment and compile QtBearer to gain detailed state tracing // #define QT_BEARERMGMT_SYMBIAN_DEBUG +#define QT_BEARERMGMT_CONFIGURATION_SNAP_PREFIX "S_" +#define QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX "I_" + class CCommsDatabase; class QEventLoop; @@ -113,6 +116,7 @@ bool changeConfigurationStateAtMaxTo(QExplicitlySharedDataPointer& sharedData, QNetworkConfiguration::StateFlags newState); #ifdef SNAP_FUNCTIONALITY_AVAILABLE + void updateMobileBearerToConfigs(TConnMonBearerInfo bearerInfo); QNetworkConfigurationPrivate* configFromConnectionMethodL(RCmConnectionMethod& connectionMethod); #else bool readNetworkConfigurationValuesFromCommsDb( @@ -145,6 +149,9 @@ // For QNetworkSessionPrivate to indicate about state changes void configurationStateChangeReport(TUint32 accessPointId, QNetworkSession::State newState); +#ifdef OCC_FUNCTIONALITY_AVAILABLE + QExplicitlySharedDataPointer configurationFromEasyWlan(TUint32 apId, TUint connectionId); +#endif public: // Data //this table contains an up to date list of all configs at any time.