--- a/qtmobility/src/bearer/qnetworkconfigmanager_maemo.cpp	Thu Apr 15 08:16:03 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfigmanager_maemo.cpp	Tue Apr 27 17:29:55 2010 +0300
@@ -302,9 +302,9 @@
 
 
 uint32_t QNetworkConfigurationManagerPrivate::getNetworkAttrs(bool is_iap_id,
-                                const QString& iap_id,
-							    QString& iap_type,
-							    QString security_method)
+                                                              const QString& iap_id,
+                                                              const QString& iap_type,
+                                                              QString security_method)
 {
     guint network_attr = 0;
     dbus_uint32_t cap = 0;
@@ -369,7 +369,6 @@
             if (!ssid.isEmpty() && accessPointConfigurations.contains(ssid)) {
                 QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr = accessPointConfigurations.take(ssid);
                 if (ptr.data()) {
-                    QString iap_type = saved_iap.value("type").toString();
                     ptr->id = iap_id;
                     ptr->iap_type = iap_type;
                     ptr->network_attrs = getNetworkAttrs(true, iap_id, iap_type, QString());
@@ -395,7 +394,7 @@
                 cpPriv->network_attrs = getNetworkAttrs(true, iap_id, iap_type, QString());
                 cpPriv->service_id = saved_iap.value("service_id").toString();
                 cpPriv->service_type = saved_iap.value("service_type").toString();
-                if (iap_type.startsWith("WLAN")) {
+                if (iap_type.startsWith(QLatin1String("WLAN"))) {
                     QByteArray ssid = saved_iap.value("wlan_ssid").toByteArray();
                     if (ssid.isEmpty()) {
                         qWarning() << "Cannot get ssid for" << iap_id;
@@ -683,7 +682,7 @@
 	}
 
         /* Remove non existing iaps since last update */
-        foreach (QString oldIface, knownConfigs) {
+        foreach (const QString &oldIface, knownConfigs) {
             QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.take(oldIface);
             if (priv.data()) {
                 priv->isValid = false;
@@ -790,7 +789,7 @@
                     if (iapid == m_onlineIapId) {
                         // It's known that there is only one global ICD connection
                         // => Because ICD state was reported to be DISCONNECTED, Device is offline
-                        m_onlineIapId = QString();
+                        m_onlineIapId.clear();
                         emit onlineStateChanged(false);
                     }
                 }
@@ -801,7 +800,7 @@
             if (iapid == m_onlineIapId) {
                 // It's known that there is only one global ICD connection
                 // => Because ICD state was reported to be DISCONNECTED, Device is offline
-                m_onlineIapId = QString();
+                m_onlineIapId.clear();
                 emit onlineStateChanged(false);
             }
         }