summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-04-14 23:22:36 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-04-15 03:13:37 (GMT)
commit86b483104fa1e8c1b2bcd255f9b94992d1d1b864 (patch)
treec1a1368a3a22e2e0cbf384f87849d18a2900e40c /src/plugins/bearer
parent3174684f5364f9c6a4acbc211d85577b3bab6449 (diff)
downloadQt-86b483104fa1e8c1b2bcd255f9b94992d1d1b864.zip
Qt-86b483104fa1e8c1b2bcd255f9b94992d1d1b864.tar.gz
Qt-86b483104fa1e8c1b2bcd255f9b94992d1d1b864.tar.bz2
Remove holes in bearer management data structures.
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r--src/plugins/bearer/icd/qicdengine.h8
-rw-r--r--src/plugins/bearer/qnetworksession_impl.h8
-rw-r--r--src/plugins/bearer/symbian/symbianengine.h8
3 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/bearer/icd/qicdengine.h b/src/plugins/bearer/icd/qicdengine.h
index a2e9a2f..841874f 100644
--- a/src/plugins/bearer/icd/qicdengine.h
+++ b/src/plugins/bearer/icd/qicdengine.h
@@ -67,13 +67,13 @@ public:
QByteArray network_id; // typically WLAN ssid or similar
QString iap_type; // is this one WLAN or GPRS
- // Network attributes for this IAP, this is the value returned by icd and
- // passed to it when connecting.
- uint32_t network_attrs;
-
QString service_type;
QString service_id;
uint32_t service_attrs;
+
+ // Network attributes for this IAP, this is the value returned by icd and
+ // passed to it when connecting.
+ uint32_t network_attrs;
};
inline IcdNetworkConfigurationPrivate *toIcdConfig(QNetworkConfigurationPrivatePointer ptr)
diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h
index 3becbf0..acf1cce 100644
--- a/src/plugins/bearer/qnetworksession_impl.h
+++ b/src/plugins/bearer/qnetworksession_impl.h
@@ -116,15 +116,15 @@ private Q_SLOTS:
void decrementTimeout();
private:
- bool opened;
-
QBearerEngineImpl *engine;
- QNetworkSession::SessionError lastError;
-
quint64 startTime;
+ QNetworkSession::SessionError lastError;
+
int sessionTimeout;
+
+ bool opened;
};
QT_END_NAMESPACE
diff --git a/src/plugins/bearer/symbian/symbianengine.h b/src/plugins/bearer/symbian/symbianengine.h
index 2e7ae60..dfd12bd 100644
--- a/src/plugins/bearer/symbian/symbianengine.h
+++ b/src/plugins/bearer/symbian/symbianengine.h
@@ -84,14 +84,14 @@ public:
QString bearerName() const;
+ QNetworkConfigurationPrivatePointer serviceNetworkPtr;
+
+ QString mappingName;
+
Bearer bearer;
TUint32 numericId;
TUint connectionId;
-
- QNetworkConfigurationPrivatePointer serviceNetworkPtr;
-
- QString mappingName;
};
inline SymbianNetworkConfigurationPrivate *toSymbianConfig(QNetworkConfigurationPrivatePointer ptr)