--- a/qtmobility/src/bearer/qnmwifiengine_unix.cpp Thu Apr 01 08:30:34 2010 +0300
+++ b/qtmobility/src/bearer/qnmwifiengine_unix.cpp Thu Apr 15 08:16:03 2010 +0300
@@ -75,17 +75,14 @@
connect(iface, SIGNAL(activationFinished(QDBusPendingCallWatcher*)),
this, SLOT(slotActivationFinished(QDBusPendingCallWatcher*)));
- QList<QDBusObjectPath> list = iface->getDevices();
-
- foreach(QDBusObjectPath path, list) {
+ foreach (const QDBusObjectPath &path, iface->getDevices())
addDevice(path);
- }
QStringList connectionServices;
connectionServices << NM_DBUS_SERVICE_SYSTEM_SETTINGS;
connectionServices << NM_DBUS_SERVICE_USER_SETTINGS;
QNetworkManagerSettings *settingsiface;
- foreach (QString service, connectionServices) {
+ foreach (const QString &service, connectionServices) {
settingsiface = new QNetworkManagerSettings(service, this);
settingsiface->setConnections();
connect(settingsiface,SIGNAL(newConnection(QDBusObjectPath)),
@@ -146,13 +143,12 @@
QString connPath;
QScopedPointer<QNetworkManagerSettings> settingsiface;
- foreach (QString service, connectionServices) {
+ foreach (const QString &service, connectionServices) {
QString ident;
settingsiface.reset(new QNetworkManagerSettings(service));
- QList<QDBusObjectPath> list = settingsiface->listConnections();
QNetworkManagerSettingsConnection *sysIface;
- foreach(QDBusObjectPath path, list) {
+ foreach (const QDBusObjectPath &path, settingsiface->listConnections()) {
ident = path.path();
bool addIt = false;
QNetworkConfigurationPrivate* cpPriv = new QNetworkConfigurationPrivate();
@@ -218,12 +214,11 @@
void QNmWifiEngine::accessPointConnections()
{
- QList<QDBusObjectPath> list = iface->getDevices();
QScopedPointer<QNetworkManagerInterfaceDevice> devIface;
- foreach(QDBusObjectPath path, list) {
+ foreach (const QDBusObjectPath &path, iface->getDevices()) {
devIface.reset(new QNetworkManagerInterfaceDevice(path.path()));
if(devIface->deviceType() == DEVICE_TYPE_802_11_WIRELESS) {
- QList<QString> apList = availableAccessPoints.uniqueKeys();
+ const QList<QString> apList = availableAccessPoints.uniqueKeys();
QList<QString>::const_iterator i;
for (i = apList.constBegin(); i != apList.constEnd(); ++i) {
@@ -256,8 +251,7 @@
{
QString interface = getInterfaceFromId(id);
QScopedPointer<QNetworkManagerInterfaceDevice> devIface;
- QList<QDBusObjectPath> list = iface->getDevices();
- foreach(QDBusObjectPath path, list) {
+ foreach (const QDBusObjectPath &path, iface->getDevices()) {
devIface.reset(new QNetworkManagerInterfaceDevice(path.path()));
if(interface == devIface->networkInterface().name()) {
@@ -355,10 +349,9 @@
connectionServices << NM_DBUS_SERVICE_USER_SETTINGS;
QScopedPointer<QNetworkManagerSettings> settingsiface;
- foreach (QString service, connectionServices) {
+ foreach (const QString &service, connectionServices) {
settingsiface.reset(new QNetworkManagerSettings(service));
- QList<QDBusObjectPath> list = settingsiface->listConnections();
- foreach(QDBusObjectPath path, list) {
+ foreach (const QDBusObjectPath &path, settingsiface->listConnections()) {
QNetworkManagerSettingsConnection sysIface(service, path.path());
knownSsids << sysIface.getSsid();
}
@@ -370,10 +363,8 @@
QScopedPointer<QNetworkManagerInterface> dbIface;
activeConnectionPaths.clear();
dbIface.reset(new QNetworkManagerInterface);
- QList <QDBusObjectPath> connections = dbIface->activeConnections();
- foreach(QDBusObjectPath conpath, connections) {
- activeConnectionPaths << conpath.path();
- }
+ foreach (const QDBusObjectPath &conpath, dbIface->activeConnections())
+ activeConnectionPaths << conpath.path();
}
QNetworkConfigurationPrivate * QNmWifiEngine::addAccessPoint( const QString &iPath, QDBusObjectPath path)
@@ -462,9 +453,8 @@
{
QStringList connectionSettings = getConnectionPathForId(id);
QNetworkManagerInterface ifaceD;
- QList<QDBusObjectPath> connections = ifaceD.activeConnections();
QScopedPointer<QNetworkManagerConnectionActive> conDetailsD;
- foreach(QDBusObjectPath path, connections) {
+ foreach (const QDBusObjectPath &path, ifaceD.activeConnections()) {
conDetailsD.reset(new QNetworkManagerConnectionActive( path.path()));
if(conDetailsD->connection().path() == connectionSettings.at(1)
&& conDetailsD->serviceName() == connectionSettings.at(0))
@@ -623,11 +613,9 @@
//active connection
QNetworkManagerConnectionActive aConn(aconpath);
- QList <QDBusObjectPath> devs = aConn.devices();
-
QScopedPointer<QNetworkManagerInterfaceDevice> ifaceDevice;
QScopedPointer<QNetworkManagerInterfaceDeviceWired> devWiredIface;
- foreach(QDBusObjectPath dev, devs) {
+ foreach (const QDBusObjectPath &dev, aConn.devices()) {
ifaceDevice.reset(new QNetworkManagerInterfaceDevice(dev.path()));
if(ifaceDevice->deviceType() == DEVICE_TYPE_802_3_ETHERNET) {
@@ -663,7 +651,7 @@
bool ok = false;
if(knownSsids.contains(ssid, Qt::CaseSensitive)) {
- foreach(QString onessid, knownSsids) {
+ foreach (const QString &onessid, knownSsids) {
if(onessid == ssid && availableAccessPoints.contains(ssid)) {
ok = true;
break;
@@ -693,8 +681,7 @@
QScopedPointer<QNetworkManagerConnectionActive> aConn;
aConn.reset(new QNetworkManagerConnectionActive(aConPath));
QScopedPointer<QNetworkManagerInterfaceDevice> ifaceDevice;
- QList<QDBusObjectPath> devices = aConn->devices();
- foreach(QDBusObjectPath device, devices) {
+ foreach (const QDBusObjectPath &device, aConn->devices()) {
ifaceDevice.reset(new QNetworkManagerInterfaceDevice(device.path()));
if(ifaceDevice->ip4Address() == ipaddress) {
return true;
@@ -711,7 +698,7 @@
QNetworkInterface interface;
QScopedPointer<QNetworkManagerConnectionActive> aConn;
- foreach(QString conpath, activeConnectionPaths) {
+ foreach (const QString &conpath, activeConnectionPaths) {
aConn.reset(new QNetworkManagerConnectionActive(conpath));
if(aConn->connection().path() == conIdPath.at(1)
&& aConn->serviceName() == conIdPath.at(0)) {
@@ -723,9 +710,8 @@
}
//try guessing
- QList<QDBusObjectPath> list = iface->getDevices();
QScopedPointer<QNetworkManagerInterfaceDevice> devIface;
- foreach(QDBusObjectPath path, list) {
+ foreach (const QDBusObjectPath &path, iface->getDevices()) {
devIface.reset(new QNetworkManagerInterfaceDevice(path.path()));
if(devIface->deviceType() == type ) {
if(devIface->state() == NM_DEVICE_STATE_DISCONNECTED) {
@@ -793,23 +779,21 @@
void QNmWifiEngine::scanForAccessPoints()
{
availableAccessPoints.clear();
- QList<QDBusObjectPath> list = iface->getDevices();
QScopedPointer<QNetworkManagerInterfaceDevice> devIface;
QScopedPointer<QNetworkManagerInterfaceDeviceWireless> devWirelessIface;
QScopedPointer<QNetworkManagerInterfaceAccessPoint> accessPointIface;
- foreach(QDBusObjectPath path, list) {
+ foreach (const QDBusObjectPath &path, iface->getDevices()) {
devIface.reset(new QNetworkManagerInterfaceDevice(path.path()));
if(devIface->deviceType() == DEVICE_TYPE_802_11_WIRELESS) {
devWirelessIface.reset(new QNetworkManagerInterfaceDeviceWireless(devIface->connectionInterface()->path()));
////////////// AccessPoints
- QList<QDBusObjectPath> apList = devWirelessIface->getAccessPoints();
- foreach(QDBusObjectPath path, apList) {
+ foreach (const QDBusObjectPath &path, devWirelessIface->getAccessPoints()) {
accessPointIface.reset(new QNetworkManagerInterfaceAccessPoint(path.path()));
- QString ssid = accessPointIface->ssid();
+ const QString ssid = accessPointIface->ssid();
availableAccessPoints.insert(ssid, path);
}
}
@@ -818,11 +802,11 @@
QString QNmWifiEngine::deviceConnectionPath(const QString &mac)
{
- QString newMac = mac;
- newMac = newMac.replace(":","_").toLower();
+ QString newMac = mac.toLower();
+ newMac.replace(QLatin1Char(':'), QLatin1Char('_'));
//device object path might not contain just mac address
//might contain extra numbers on the end. thanks HAL
- foreach(QString device, devicePaths) {
+ foreach (const QString &device, devicePaths) {
if(device.contains(newMac)) {
newMac = device;
break;
@@ -837,11 +821,10 @@
connectionServices << NM_DBUS_SERVICE_SYSTEM_SETTINGS;
connectionServices << NM_DBUS_SERVICE_USER_SETTINGS;
QScopedPointer<QNetworkManagerSettings> settingsiface;
- foreach (QString service, connectionServices) {
+ foreach (const QString &service, connectionServices) {
settingsiface.reset(new QNetworkManagerSettings(service));
- QList<QDBusObjectPath> list = settingsiface->listConnections();
QScopedPointer<QNetworkManagerSettingsConnection> sysIface;
- foreach(QDBusObjectPath path, list) {
+ foreach (const QDBusObjectPath &path, settingsiface->listConnections()) {
sysIface.reset(new QNetworkManagerSettingsConnection(service, path.path()));
if(sysIface->getUuid() == uuid)
return QStringList() << service << sysIface->connectionInterface()->path();