--- a/securitysettings/cpwlansecurityuiplugins/cpwpaui/inc/cpwpaui.h	Fri Jun 11 16:24:23 2010 +0100
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/inc/cpwpaui.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 WPA/WPA2 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 WPA/WPA2 configuration
+ *
+ */
 
 /*
-* %version: tr1cfwln#11.1.1 %
+* %version: tr1cfwln#17 %
 */
 
 
@@ -26,21 +26,17 @@
 
 // System includes
 #include <cpsettingformitemdata.h>
-#include <hbglobal.h>
-#include <HbMessageBox>
+#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 QTranslator;
+class HbTranslator;
+
 
 /*!
  * @addtogroup group_wlan_security_ui_plugin_wpa/wpa2
@@ -72,24 +68,8 @@
     CpSettingFormItemData* uiInstance(
             CpItemDataHelper &dataHelper);
     
-private:
-    
-    bool tryUpdate();
-
-    void handleUpdateError();
-
-    void showMessageBox( HbMessageBox::MessageBoxType type,
-            const QString &text);
+    bool validateSettings();
     
-    void updateWpaSettings();
-    
-  
-private slots:
- 
-    //void currentEapPlugin(int plugin);    
-    //void wpaTypeChanged(int pskEnable);
-    void pskKeyChanged(QString& key);
-         
 
 private:
     
@@ -98,11 +78,8 @@
     //!WPA security group item
     CpSettingFormItemData* mUi;   
 
-    //! Connection method Id
-    int mCmId;
-   
     //!Translator for all the localisation Text Id's
-    QTranslator *mTranslator;
+    HbTranslator *mTranslator;
     
     //! Connection Settings Shim connection method pointer    
     CmConnectionMethodShim *mCmCM;    
@@ -113,9 +90,6 @@
     //!WPA ui Implementer Interface
     QScopedPointer <CpWpaCmnUi> mWpaUi;
     
-    //! Message box for info notes
-    QSharedPointer<HbMessageBox> mMessageBox;
-    
  };
 
 /*! @} */