--- a/securitysettings/cpwlansecurityuiplugins/cpwepui/src/cpwepui.cpp	Mon Aug 23 13:36:11 2010 +0300
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/src/cpwepui.cpp	Fri Sep 03 09:22:44 2010 +0300
@@ -17,7 +17,7 @@
  */
 
 /*
- * %version: tr1cfwln#24 %
+ * %version: tr1cfwln#25 %
  */
 
 //User Includes
@@ -177,9 +177,11 @@
     mUi = new CpSettingFormItemData(HbDataFormModelItem::GroupItem, hbTrId(
             "txt_occ_subhead_security_settings"));
 
+    mUi->setContentWidgetData("objectName", "CpWepUi");
+    
     CpSettingFormItemData *wepKeyInUse = new CpSettingFormItemData(
             HbDataFormModelItem::ComboBoxItem, hbTrId(
-                    "txt_occ_setlabel_wep_key_in_use"), mUi);
+                    "txt_occ_setlabel_wep_key_in_use"));
     QStringList wepKeys;
     wepKeys.append(hbTrId("txt_occ_setlabel_wep_key_in_val_1"));
     wepKeys.append(hbTrId("txt_occ_setlabel_wep_key_in_val_2"));
@@ -188,6 +190,8 @@
 
     wepKeyInUse->setContentWidgetData("items", wepKeys);
     wepKeyInUse->setContentWidgetData("currentIndex", mNewKeySelected);
+    wepKeyInUse->setContentWidgetData("objectName", "CpWepUiKeyInUse");
+    
     dataHelpper.addConnection(wepKeyInUse, SIGNAL(currentIndexChanged(int)),
             this, SLOT(wepKeyInUseChanged(int)));
     mUi->appendChild(wepKeyInUse);
@@ -265,16 +269,19 @@
         }
         
     mWepKeyText[index] = new CpSettingFormItemData(
-            HbDataFormModelItem::TextItem,
-            textId, mUi);
+        HbDataFormModelItem::TextItem,
+        textId);
+    
 
     if (mKeyData[index].length() != 0) {
-        mWepKeyText[index]->setContentWidgetData("text",
-                mKeyData[index]);
+        mWepKeyText[index]->setContentWidgetData("text", mKeyData[index]);
     }
     mWepKeyText[index]->setContentWidgetData("echoMode",HbLineEdit::PasswordEchoOnEdit);
     mWepKeyText[index]->setContentWidgetData("smileysEnabled", "false");
-
+    QString objectName;
+    objectName.setNum(index);
+    objectName.prepend("CpWepUiKeyEditor");
+    mWepKeyText[index]->setContentWidgetData("objectName", objectName);
     
     mUi->appendChild(mWepKeyText[index]);
     OstTraceFunctionExit1(CPWEPUI_CREATEWEPKEYGROUP_EXIT,this);
@@ -643,6 +650,7 @@
 
     // Create a message box
     mMessageBox = QSharedPointer<HbMessageBox> (new HbMessageBox(type));
+    mMessageBox->setObjectName("CpWepUiMessageBox");
     mMessageBox->setText(text);
     mMessageBox->open();
 

--- a/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/src/cpwpacmnui_p.cpp	Mon Aug 23 13:36:11 2010 +0300
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/src/cpwpacmnui_p.cpp	Fri Sep 03 09:22:44 2010 +0300
@@ -17,7 +17,7 @@
  */
 
 /*
- * %version: tr1cfwln#13 %
+ * %version: tr1cfwln#14 %
  */
  
 // User Includes
@@ -121,6 +121,8 @@
     mCmnUi = new CpSettingFormItemData(HbDataFormModelItem::GroupItem,
             hbTrId("txt_occ_subhead_security_settings"));
 
+    mCmnUi->setContentWidgetData("objectName", "CpWpaCmUi");
+    
     //LoadUi based on the security mode
     loadUi();
 
@@ -155,18 +157,19 @@
     // In case of the object exists just update the data
     if (!mWpaEapItem) {
         mWpaEapItem = new CpSettingFormItemData(
-                HbDataFormModelItem::ComboBoxItem, hbTrId(
-                        "txt_occ_setlabel_wpawpa2"), mCmnUi);
+            HbDataFormModelItem::ComboBoxItem, 
+            hbTrId("txt_occ_setlabel_wpawpa2"));
 
         QStringList wpatype;
         wpatype.append(hbTrId("txt_occ_setlabel_wpawpa2_val_eap"));
         wpatype.append(hbTrId("txt_occ_setlabel_wpawpa2_val_preshared_key"));
 
+        mWpaEapItem->setContentWidgetData("objectName", "CpWpaCmnUiTypeSelector");
         mWpaEapItem->setContentWidgetData("items", wpatype);
 
         mDataHelper.addConnection(mWpaEapItem,
-                SIGNAL(currentIndexChanged(int)), this,
-                SLOT(wpaTypeChanged(int)));
+            SIGNAL(currentIndexChanged(int)), this,
+            SLOT(wpaTypeChanged(int)));
 
         mCmnUi->appendChild(mWpaEapItem);
     }
@@ -188,16 +191,19 @@
 
     if (!mPskKeyText) {
         mPskKeyText = new CpSettingFormItemData(
-                HbDataFormModelItem::TextItem, hbTrId(
-                        "txt_occ_setlabel_preshared_key"), mCmnUi);
+            HbDataFormModelItem::TextItem, 
+            hbTrId("txt_occ_setlabel_preshared_key"));
 
+        mPskKeyText->setContentWidgetData("objectName", "CpWpaCmnUiPskEditor");
         mPskKeyText->setContentWidgetData("echoMode", HbLineEdit::PasswordEchoOnEdit);
         mPskKeyText->setContentWidgetData("smileysEnabled", "false");
-        mDataHelper.addConnection(mPskKeyText, SIGNAL( editingFinished ()),
-                this, SLOT(pskKeyChanged() ));
+        mDataHelper.addConnection(
+            mPskKeyText, SIGNAL( editingFinished ()),
+            this, SLOT(pskKeyChanged() ));
         
-        mDataHelper.connectToForm(SIGNAL(itemShown (const QModelIndex &) ), 
-                   this, SLOT(setEditorPreferences(const QModelIndex &)));
+        mDataHelper.connectToForm(
+            SIGNAL(itemShown (const QModelIndex &) ), 
+            this, SLOT(setEditorPreferences(const QModelIndex &)));
 
         mCmnUi->appendChild(mPskKeyText);
     }
@@ -228,6 +234,7 @@
             list << i->localizationId();
         }
         
+        mEapPlugins->setContentWidgetData("objectName", "CpWpaCmnUiEapTypeSelector");   
         mEapPlugins->setContentWidgetData("items", list);
 
         mDataHelper.addConnection(mEapPlugins,
@@ -253,9 +260,12 @@
     OstTraceFunctionEntry1( CPWPACMNUIPRIVATE_CREATEEAPENTRYITEM_ENTRY, this );
 
     if (!mEapEntry) {
-        mEapEntry = new EapEntryItemData(this, mDataHelper, hbTrId(
-                "txt_occ_button_eap_type_settings"));
+        mEapEntry = new EapEntryItemData(
+            this, 
+            mDataHelper, 
+            hbTrId("txt_occ_button_eap_type_settings"));
 
+        mEapEntry->setContentWidgetData("objectName", "CpWpaCmnUiEapEntryItem");
         mCmnUi->appendChild(mEapEntry);
     }
 
@@ -274,9 +284,12 @@
 
     if (!mUnencryptedConnection) {
         mUnencryptedConnection = new CpSettingFormItemData(
-                HbDataFormModelItem::CheckBoxItem, hbTrId(
-                        "txt_occ_setlabel_unencrypted_connection"), mCmnUi);
+            HbDataFormModelItem::CheckBoxItem, 
+            hbTrId("txt_occ_setlabel_unencrypted_connection"));
 
+        mUnencryptedConnection->setContentWidgetData(
+            "objectName", 
+            "CpWpaCmnUiUnencryptedConnection");
         mUnencryptedConnection->setContentWidgetData("text", hbTrId(
                 "txt_occ_setlabel_unencrypted_connection_val_allowe"));
 
@@ -532,6 +545,7 @@
     OstTraceFunctionEntry1( CPWPACMNUIPRIVATE_SHOWMESSAGEBOX_ENTRY, this );
     // Create a message box
     mMessageBox = QSharedPointer<HbMessageBox> (new HbMessageBox(type));
+    mMessageBox->setObjectName("CpWpaCmnUiMessageBox");
     mMessageBox->setText(text);
     mMessageBox->open();
     OstTraceFunctionExit1( CPWPACMNUIPRIVATE_SHOWMESSAGEBOX_EXIT, this );