--- a/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardeap.cpp	Thu Sep 02 21:36:44 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardeap.cpp	Fri Sep 17 08:35:49 2010 +0300
@@ -16,14 +16,18 @@
 */
 
 // System includes
+
+#include <HbParameterLengthLimiter>
+
 #include <QTest>
 #include <QDebug>
 #include <QList>
+
 #include <cmmanagerdefines_shim.h>
 #include <wlanerrorcodes.h>
-#include <HbParameterLengthLimiter>
 
 // User includes
+
 #include "testwlanwizardeap.h"
 #include "testwlanwizardeap_conf.h"
 #include "hbautotest.h"
@@ -60,7 +64,8 @@
     mEapQtUtilsContext->createEapAkaSim(EapQtPluginHandle::PluginEapAka);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -112,7 +117,8 @@
     const QString ssid("tc_eap_leap");
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,
@@ -555,7 +561,8 @@
     mEapQtUtilsContext->setSelectectedOuterTypesReturn(false);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -590,7 +597,8 @@
     mEapQtUtilsContext->setOuterConfigReturn(false);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -624,7 +632,8 @@
     mEapQtUtilsContext->createEapAkaSim(EapQtPluginHandle::PluginEapAka);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -690,7 +699,8 @@
         EapQtExpandedEapType::TypePeap,EapQtConfig::Realm);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,
@@ -776,7 +786,8 @@
     validatorPassword->setReturnValue(EapQtValidator::StatusInvalid);
 
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,
@@ -831,7 +842,8 @@
         -1);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -875,7 +887,8 @@
         0);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -939,7 +952,8 @@
         1);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -1005,7 +1019,8 @@
         0);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -1149,7 +1164,8 @@
         "p");
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,
@@ -1205,7 +1221,8 @@
         password);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,
@@ -1273,7 +1290,8 @@
         "p");
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,
@@ -1338,7 +1356,8 @@
         password);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,
@@ -1611,7 +1630,8 @@
     const QString ssid("tc_eap_aka_sim");
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecMode802_1x, 
         false,
@@ -1679,7 +1699,8 @@
     mEapQtUtilsContext->setInnerConfigReturn(saveInnerConfReturn);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,
@@ -1736,7 +1757,8 @@
     mEapQtUtilsContext->createEapAkaSim(EapQtPluginHandle::PluginEapAka);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa2, 
         false,
@@ -1792,7 +1814,8 @@
         password);
     
     mView->mWizard->setParameters(
-        ssid, 
+        ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeWpa, 
         false,