diff -r fcbbe021d614 -r 9c97ad6591ae bearermanagement/mpm/inc/mpmwlanquerydialog.h
--- a/bearermanagement/mpm/inc/mpmwlanquerydialog.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmwlanquerydialog.h	Mon May 03 12:53:07 2010 +0300
@@ -22,16 +22,8 @@
 #include <e32std.h>
 #include <wdbifwlansettings.h> //for struct
 #include <ConnectionUiUtilities.h>
-#include <wifiprotuiclient.h>
-#include <wifiprotreturn.h>
 
-#include "mpmiapselection.h" // for TOfflineNoteResponse
-
-// ID of Easy Wep dialog
-const TUid KUidEasyWepDlg = { 0x101FD673 };
-
-// ID of Easy Wpa dialog
-const TUid KUidEasyWpaDlg = { 0x101FD674 };
+#include "mpmcommsdataccess.h"
 
 // ID of OfflineWlanNote dialog
 const TUid KUidCOfflineWlanNoteDlg = { 0x101FD671 };
@@ -51,16 +43,8 @@
                                         ///< Wlan network supports Protected Setup
     };
 
-const TInt KEasyWepQuery256BitMaxLength = 58;
+class CMPMIapSelection;
 
-class TWlanAgtWepKeyData
-    {
-public:
-    TBuf< KEasyWepQuery256BitMaxLength > iKey;
-    TBool iHex;
-    };
-
-class CMPMIapSelection;
 /**
  *  Handles displaying wlan related dialogs
  *
@@ -72,12 +56,7 @@
 
 enum TWlanQueryState
     {
-    EOffline,
-    EWlanNetwork,
-    EWepSettings,
-    EWpaSettings, 
-    EWPS,
-    ERetrySettingsStorage
+    EOffline
     };
 
 public:
@@ -119,14 +98,6 @@
         * @since 3.2
         */
         void StartWlanQueryL();
-        
-        /**
-        * Stores user defined easy wlan parameters to commsdat
-        * if easy wlan has been selected.
-        *
-        * @since 3.2
-        */
-        void StoreEasyWlanSelectionL();
 
 private:
 
@@ -134,105 +105,16 @@
          * Propagates wlan network selection as an initial value for the dialog,
          * Used if there are several dialogs queued.
          *
-         * @param aWlanIapId     Selected WLAN IAP
-         * @param aOfflineStatus Offline note response
          * @param aDialogStatus  Status of the dialog when destroyed.
          * @since 3.2
          */
-        void OfferInformation( TUint32 aWlanIapId, 
-                               TOfflineNoteResponse aOfflineStatus,
-                               TInt aDialogStatus );
+        void OfferInformation( TInt aDialogStatus );
 
-        CMPMWlanQueryDialog( CMPMIapSelection&  aSession,
+        CMPMWlanQueryDialog( CMPMIapSelection&  aIapSelection,
                              TUint32            aSelectedWlanIap );
 
         void ConstructL();
 
-        /**
-        * Gets Easy Wlan data from member variables and stores 
-        * it to arguments
-        *
-        * @since 9.1
-        * @param aSsid Wlan iap ssid, stored in used ssid field
-        * @param aSecMode Wlan iap security mode
-        * @param aConnMode Wlan iap connection mode
-        * @param aWepKeyData Wlan iap wep key data
-        * @param aEnableWpaPsk Wlan iap enable psk mode
-        * @param aWpaPsk Wlan iap wpa psk
-        * @param aWpaKeyLen Wlan iap wpa key length
-        */
-        void GetEasyWlanDataL( TWlanSsid&    aSsid,
-                               TUint&        aSecMode,
-                               TWlanNetMode& aConnMode,
-                               TWepKeyData&  aWepKeyData, 
-                               TUint&        aEnableWpaPsk,
-                               TDes8&        aWpaPsk,
-                               TUint&        aWpaKeyLen  );
-
-        /**
-        * Maps TWlanConnectionSecurityMode to security mode stored in CommsDat
-        *
-        * @since 9.1
-        * @param aConnSecmode Security mode in TWlanConnectionSecurityMode format
-        * @param aCommsdatSecMode returned security mode value in CommsDat format
-        */
-        TInt ConnSecModeToCommsDatSecMode( TWlanConnectionSecurityMode aConnSecmode,
-                                           TUint& aCommsdatSecMode ) const;
-
-        /**
-        * Maps TWlanIapSecurityMode to security mode stored in CommsDat
-        *
-        * @since 9.1
-        * @param aConnSecmode Security mode in TWlanIapSecurityMode format
-        * @param aCommsdatSecMode returned security mode value in CommsDat format
-        */
-        TInt IapSecModeToCommsDatSecMode( TWlanIapSecurityMode aConnSecmode,
-                                          TUint& aCommsdatSecMode ) const;
-
-        /**
-        * Gets Easy Wlan data from member variables when WPS has been used 
-        * and stores it to arguments
-        *
-        * @since 9.1
-        * @param aSsid Wlan iap ssid, stored in used ssid field
-        * @param aSecMode Wlan iap security mode
-        * @param aConnMode Wlan iap connection mode
-        * @param aWepKeyData WEP key data
-        * @param aEnableWpaPsk Wlan iap enable psk mode
-        * @param aWpaPsk Wlan iap wpa psk
-        * @param aWpaKeyLen Wlan iap wpa key length
-        */
-        void GetEasyWlanDataForWpsL( TWlanSsid&    aSsid,
-                                     TUint&        aSecMode,
-                                     TWlanNetMode& aConnMode,
-                                     TWepKeyData&  aWepKeyData, 
-                                     TUint&        aEnableWpaPsk,
-                                     TDes8&        aWpaPsk,
-                                     TUint&        aWpaKeyLen  );
-
-        /**
-        * Starts WPS dialog and sets the active object active.
-        *
-        * @since 9.1
-        */
-        void StartWpsDlgL();
-
-        /**
-        * Determines whether WEP key is hex format based on the length
-        *
-        * @since 9.1
-        * @param aLength 
-        * @return ETrue if format is hex, otherwise EFalse
-        */
-        TBool IsWepFormatHexL( TInt aLength ) const;
-
-        /**
-        * Get the network preferences using ConnectionUiUtilities API.
-        *
-        * @since 5.1
-        */
-        void GetNetworkPrefs();
-
 private: // data
 
         // Reference to iap selection object
@@ -244,47 +126,20 @@
         // Stores data for wlan network guery
         TPckgBuf<TMpmWlanNetworkPrefs> iNetworkPrefs;
         
-        // Stores data for wep query
-        TPckgBuf<TWlanAgtWepKeyData> iNotifWep;
-        
-        // Stores data for wpa query
-        TPckgBuf< TBuf< KWLMMaxWpaPskLength > > iNotifWpaKey;
-
         //Interfce to Notifier
         RNotifier iNotifier;
 
         //State of querying Wlan settings
         TWlanQueryState iWlanQueryState;
             
-        // selected wlan iap id
-        TUint32 iWlanIapId;
-            
-        // ETrue if user has selected easy wlan
-        TBool iEasyWlanSelected;
-            
-        // Flag that can be used to cancel the dialog startup based on earlier dialog
-        TInt iOverrideStatus;
-            
         // Connection Ui Utilities pointer
         CConnectionUiUtilities* iConnUiUtils;
-
-        // Contains WLAN settings received through WPS
-        TWlanProtectedSetupCredentialAttribute iWpsAttribute;
-
-        // WPS client pointer for displaying WPS dialogs
-        CWiFiProtUiClient* iWps;
-
-        // Contains WPS return value
-        WiFiProt::TWiFiReturn iWpsReturn;
-
-        // True if wps has been completed. 
-        TBool iWpsCompleted;
         
-        // Retry count
-        TUint32 iRetryCount;
+        // Wlan iap
+        TUint32 iWlanIapId;
         
-        // Retry timer
-        RTimer iTimer;
+        // Flag that can be used to cancel the dialog startup based on earlier dialog
+        TInt iOverrideStatus;
     };
 
 #endif // MPMWLANQUERYDIALOG_H