diff -r d965ea371a4f -r 4ea83c148e84 qtmobility/src/bearer/qnetworksession_s60_p.h --- a/qtmobility/src/bearer/qnetworksession_s60_p.h Tue May 25 13:34:51 2010 +0300 +++ b/qtmobility/src/bearer/qnetworksession_s60_p.h Wed Jun 09 10:36:00 2010 +0300 @@ -72,11 +72,10 @@ class ConnectionProgressNotifier; -class QNetworkSessionPrivate : public QObject, public CActive, +class QNetworkSessionPrivate : public QObject, public CActive #ifdef SNAP_FUNCTIONALITY_AVAILABLE - public MMobilityProtocolResp, + , public MMobilityProtocolResp #endif - public MConnectionMonitorObserver { Q_OBJECT public: @@ -129,8 +128,9 @@ void RunL(); void DoCancel(); -private: // MConnectionMonitorObserver - void EventL(const CConnMonEventBase& aEvent); +private Q_SLOTS: + void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState); + void configurationRemoved(const QNetworkConfiguration& config); private: TUint iapClientCount(TUint aIAPId) const; @@ -166,6 +166,13 @@ mutable RConnection iConnection; mutable RConnectionMonitor iConnectionMonitor; ConnectionProgressNotifier* ipConnectionNotifier; + + bool iHandleStateNotificationsFromManager; + bool iFirstSync; + bool iStoppedByUser; + bool iClosedByUser; + TUint32 iDeprecatedConnectionId; + #ifdef SNAP_FUNCTIONALITY_AVAILABLE CActiveCommsMobilityApiExt* iMobility; #endif