--- a/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/inc/cpwpa2ui.h	Fri Jun 11 16:24:23 2010 +0100
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/inc/cpwpa2ui.h	Thu Jul 22 16:34:37 2010 +0100
@@ -1,23 +1,23 @@
 /*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*    Control Panel QT UI for WPA2 only configuration
-*
-*/
+ * 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 "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *    Control Panel QT UI for WPA2 only configuration
+ *
+ */
 
 /*
-* %version: 10 %
+* %version: tr1cfwln#15 %
 */
 
 
@@ -26,23 +26,17 @@
 
 // System includes
 #include <cpsettingformitemdata.h>
-#include <HbMessageBox>
-//#include <HbTranslator>
-//#include <QSharedPointer>
-#include <QTranslator>
-
+#include <cpwlansecurityplugininterface.h>
 
 // User includes
-#include "cpwlansecurityplugininterface.h"
+
 
 // Forward declarations
-class EapPluginInformation;
-class PluginInformation;
-class CpBaseSettingView;
 class EapQtConfigInterface;
-class EapEntyItemData;
 class CpWpaCmnUi;
 class CmConnectionMethodShim;
+class HbTranslator;
+
 
 /*!
  * @addtogroup group_wlan_security_ui_plugin_wpa2_only
@@ -74,39 +68,19 @@
               
        CpSettingFormItemData* uiInstance(
                CpItemDataHelper &dataHelper);
-    
-private:
        
-       bool tryUpdate();
-
-       void handleUpdateError();
-
-       void showMessageBox( HbMessageBox::MessageBoxType type,
-           const QString &text);
-
-       void updateWpaSettings();
-  
-private slots:
- 
-    //void currentEapPlugin(int currentPlugin);    
-    //void wpaTypeChanged(int pskEnable);
-    void pskKeyChanged(QString& key);
-    
+       bool validateSettings();
 
 private:
     
     Q_DISABLE_COPY(CpWpa2Ui)
         
     //!WPA security group item
-    CpSettingFormItemData* mUi;   
+    CpSettingFormItemData* mUi;  
+    
+    //!Translator for all the localisation Text Id's    
+   	HbTranslator* mTranslator;
 
-    //! Connection method Id
-    int mCmId;
-   
-    //!Translator for all the localisation Text Id's
-    //QSharedPointer<HbTranslator> mTranslator;
-    QTranslator* mTranslator;
-    
     //! Connection Settings Shim connection method pointer    
     CmConnectionMethodShim *mCmCM;    
     
@@ -115,9 +89,6 @@
 	
 	//!WPA ui Implementer Interface
     QScopedPointer <CpWpaCmnUi> mWpa2Ui;
-    
-    //! Message box for info notes
-    QSharedPointer<HbMessageBox> mMessageBox;
 
  };