--- a/qtmobility/src/systeminfo/qsysteminfo_win.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_win.cpp	Mon May 03 13:18:40 2010 +0300
@@ -463,7 +463,7 @@
 
 void QSystemInfoPrivate::currentLanguageTimeout()
 {
-    QString tmpLang = currentLanguage();
+    const QString tmpLang = currentLanguage();
     if(currentLanguageStr != tmpLang) {
         currentLanguageStr = tmpLang;
         emit currentLanguageChanged(currentLanguageStr);
@@ -474,7 +474,7 @@
 
 QString QSystemInfoPrivate::currentLanguage() const
 {
- QString lang = QLocale::system().name().left(2);
+    QString lang = QLocale::system().name().left(2);
     if(lang.isEmpty() || lang == "C") {
         lang = "en";
     }
@@ -489,8 +489,8 @@
     if(transDir.exists()) {
         QStringList localeList = transDir.entryList( QStringList() << "qt_*.qm" ,QDir::Files
                                                      | QDir::NoDotAndDotDot, QDir::Name);
-        foreach(QString localeName, localeList) {
-            QString lang = localeName.mid(3,2);
+        foreach(const QString localeName, localeList) {
+            const QString lang = localeName.mid(3,2);
             if(!langList.contains(lang) && !lang.isEmpty() && !lang.contains("help")) {
                 langList << lang;
             }
@@ -615,7 +615,7 @@
         {
             QSystemStorageInfo mi;
             QStringList drives = mi.logicalDrives();
-            foreach(QString drive, drives) {
+            foreach(const QString drive, drives) {
                 if(mi.typeForDrive(drive) == QSystemStorageInfo::RemovableDrive) {
                     featureSupported = true;
                 }
@@ -861,8 +861,8 @@
     modeList << QSystemNetworkInfo::BluetoothMode;
     modeList << QSystemNetworkInfo::WimaxMode;
 
-    foreach(QSystemNetworkInfo::NetworkMode mode, modeList) {
-       networkSignalStrength(mode);
+    foreach(const QSystemNetworkInfo::NetworkMode mode, modeList) {
+        networkSignalStrength(mode);
     }
     switch(QSysInfo::WindowsVersion) {
     case QSysInfo::WV_VISTA:
@@ -886,8 +886,8 @@
     modeList << QSystemNetworkInfo::BluetoothMode;
     modeList << QSystemNetworkInfo::WimaxMode;
 
-    foreach(QSystemNetworkInfo::NetworkMode mode, modeList) {
-       networkStatus(mode);
+    foreach(const QSystemNetworkInfo::NetworkMode mode, modeList) {
+        networkStatus(mode);
     }
 
  }
@@ -1272,6 +1272,24 @@
     return isDefaultGateway;
 }
 
+QSystemNetworkInfo::NetworkMode QSystemNetworkInfoPrivate::currentMode()
+{
+    QList <QSystemNetworkInfo::NetworkMode> modeList;
+    modeList << QSystemNetworkInfo::GsmMode
+            << QSystemNetworkInfo::CdmaMode
+            << QSystemNetworkInfo::WcdmaMode
+            << QSystemNetworkInfo::WlanMode
+            << QSystemNetworkInfo::EthernetMode
+            << QSystemNetworkInfo::BluetoothMode
+            << QSystemNetworkInfo::WimaxMode;
+
+    for (int i = 0; i < modeList.size(); ++i) {
+        if ( isDefaultMode(modeList.at(i)))
+            return modeList.at(i);
+    }
+
+    return QSystemNetworkInfo::UnknownMode;
+}
 
 QSystemDisplayInfoPrivate::QSystemDisplayInfoPrivate(QObject *parent)
         : QObject(parent)
@@ -1682,12 +1700,12 @@
 
 QString QSystemDeviceInfoPrivate::imei()
 {
-        return "Sim Not Available";
+        return "";
 }
 
 QString QSystemDeviceInfoPrivate::imsi()
 {
-        return "Sim Not Available";
+        return "";
 }
 
 QString QSystemDeviceInfoPrivate::manufacturer()