--- a/qtmobility/src/bearer/qnetworkconfigmanager_s60_p.h Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfigmanager_s60_p.h Fri Jun 11 14:26:25 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)
**
@@ -55,6 +55,7 @@
#include <qnetworkconfigmanager.h>
#include <qnetworkconfiguration_s60_p.h>
+#include <qnetworksession.h>
#include <QHash>
#include <rconnmon.h>
@@ -62,6 +63,9 @@
#include <cmmanager.h>
#endif
+// Uncomment and compile QtBearer to gain detailed state tracing
+// #define QT_BEARERMGMT_SYMBIAN_DEBUG
+
class CCommsDatabase;
class QEventLoop;
@@ -92,6 +96,9 @@
void configurationChanged(const QNetworkConfiguration& config);
void onlineStateChanged(bool isOnline);
+ void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId,
+ QNetworkSession::State newState);
+
public Q_SLOTS:
void updateConfigurations();
@@ -126,12 +133,17 @@
void startMonitoringIAPData(TUint32 aIapId);
QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> dataByConnectionId(TUint aConnectionId);
-protected: // From CActive
+protected:
+ // From CActive
void RunL();
void DoCancel();
-private: // MConnectionMonitorObserver
+private:
+ // MConnectionMonitorObserver
void EventL(const CConnMonEventBase& aEvent);
+ // For QNetworkSessionPrivate to indicate about state changes
+ void configurationStateChangeReport(TUint32 accessPointId,
+ QNetworkSession::State newState);
public: // Data
//this table contains an up to date list of all configs at any time.