diff -r 7a0216d033ac -r fe6b6762fccd securitysettings/cpeapuiplugins/cpeapsimakaui/inc/cpeapsimakaui.h
--- a/securitysettings/cpeapuiplugins/cpeapsimakaui/inc/cpeapsimakaui.h	Wed Jun 23 18:14:55 2010 +0300
+++ b/securitysettings/cpeapuiplugins/cpeapsimakaui/inc/cpeapsimakaui.h	Tue Jul 06 14:18:35 2010 +0300
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
- * under the terms of the License "Eclipse Public License v1.0"
+ * under the terms of "Eclipse Public License v1.0"
  * which accompanies this distribution, and is available
  * at the URL "http://www.eclipse.org/legal/epl-v10.html".
  *
@@ -17,7 +17,7 @@
  */
 
 /*
- * %version:  12 %
+ * %version:  14 %
  */
 
 #ifndef CPEAPSIMAKAUI_H
@@ -34,6 +34,7 @@
 // Forward declarations
 class HbDataForm;
 class HbDataFormModel;
+class HbDataFormModelItem;
 class CpSettingFormItemData;
 class EapQtValidator;
 
@@ -46,7 +47,7 @@
  * @{
  */
 
-class CpEapSimAkaUi: public CpBaseSettingView
+class CpEapSimAkaUi : public CpBaseSettingView
 {
 Q_OBJECT
 
@@ -62,10 +63,14 @@
     void close();
     
 private:
-    void initializeSimAkaUi();
+    void createUi();
+    void createUsername();
+    void createRealm();
+    
     bool checkStateToBool(const int state);
     int boolToCheckState(const bool state);
-    void storeSettings();
+    
+    bool storeSettings();
     bool validate();
     bool validateGroup(CpSettingFormItemData *edit, CpSettingFormItemData *checkBox,
         EapQtValidator* validator);
@@ -76,17 +81,35 @@
     void realmAutomaticChanged(int state);
 
 private:
+    //! Pointer to EapQtConfigInterface
     QScopedPointer <EapQtConfigInterface> mConfigIf;
+    //! Plugin info
     EapQtPluginInfo mPluginInfo;
+    //! Outer handle
     EapQtPluginHandle mOuterHandle;
+    //! Current EAP configuration
+    EapQtConfig mEapConfig;
+    
+    //! Dataform
     HbDataForm *mForm;
+    //! Datform model
     HbDataFormModel *mModel;
+    //! Control Panel item data helper for EAP-SIM/AKA plugins
+    CpItemDataHelper *mItemDataHelper;
+    //! EAP-SIM/AKA settings group
+    HbDataFormModelItem *mGroupItem;
+    //! Username generate automatically checkBox
     CpSettingFormItemData *mUsernameAutomatic;
+    //! Username lineEdit
     CpSettingFormItemData *mUsername;
+    //! Realm generate automatically checkBox
     CpSettingFormItemData *mRealmAutomatic;
+    //! Realm lineEdit
     CpSettingFormItemData *mRealm;
 
+    //! Realm validator
     QScopedPointer<EapQtValidator> mValidatorRealm;
+    //! Username validator
     QScopedPointer<EapQtValidator> mValidatorUsername;
 };