--- a/qtmobility/src/bearer/qnetworksession_s60_p.h Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession_s60_p.h Mon May 03 13:18:40 2010 +0300
@@ -58,25 +58,25 @@
#include <QDateTime>
#include <e32base.h>
-#include <CommDbConnPref.h>
+#include <commdbconnpref.h>
#include <es_sock.h>
#include <rconnmon.h>
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
#include <comms-infras/cs_mobility_apiext.h>
#endif
-
-typedef int(*TOpenCSetdefaultifFunction)(const struct ifreq*);
+#ifdef OCC_FUNCTIONALITY_AVAILABLE
+ #include <extendedconnpref.h>
+#endif
QTM_BEGIN_NAMESPACE
class ConnectionProgressNotifier;
+class QNetworkSessionPrivate : public QObject, public CActive,
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
-class QNetworkSessionPrivate : public QObject, public CActive, public MMobilityProtocolResp,
+ public MMobilityProtocolResp,
+#endif
public MConnectionMonitorObserver
-#else
-class QNetworkSessionPrivate : public QObject, public CActive, public MConnectionMonitorObserver
-#endif
{
Q_OBJECT
public:
@@ -162,9 +162,6 @@
QNetworkSession* q;
QDateTime startTime;
- RLibrary iOpenCLibrary;
- TOpenCSetdefaultifFunction iDynamicSetdefaultif;
-
mutable RSocketServ iSocketServ;
mutable RConnection iConnection;
mutable RConnectionMonitor iConnectionMonitor;
@@ -176,6 +173,7 @@
QNetworkSession::SessionError iError;
TInt iALREnabled;
TBool iALRUpgradingConnection;
+ TBool iConnectInBackground;
QList<QString> iKnownConfigsBeforeConnectionStart;