--- a/apengine/apsettingshandlerui/src/ApNetSelPopupList.cpp	Fri May 14 10:52:16 2010 +0300
+++ b/apengine/apsettingshandlerui/src/ApNetSelPopupList.cpp	Mon May 17 09:55:27 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 
 #include <ApNetworkItem.h>
-#include <csxhelp/cp.hlp.hrh>
 #include <featmgr.h>
 
 #include "ApSettingsHandlerUI.hrh"
@@ -183,8 +182,6 @@
     APSETUILOGGER_ENTERFN( EListbox,"NetSelPopup::GetHelpContext")
     
     aContext.iMajor = iHandler->iHelpMajor;
-    // help no longer available for user, use dummy ID
-    aContext.iContext = KSET_HLP_AP_SETTING_GPRS;
     
     APSETUILOGGER_LEAVEFN( EListbox,"NetSelPopup::GetHelpContext")
     }

--- a/apengine/apsettingshandlerui/src/ApSelPopupList.cpp	Fri May 14 10:52:16 2010 +0300
+++ b/apengine/apsettingshandlerui/src/ApSelPopupList.cpp	Mon May 17 09:55:27 2010 +0300
@@ -24,9 +24,6 @@
 #include <ApSetUI.rsg>
 #include <featmgr.h>
 
-#include <csxhelp/cp.hlp.hrh>
-
-
 #include "ApSelectorListBoxModel.h"
 #include "ApSettingsModel.h"
 #include "ApSettingsHandlerUI.hrh"
@@ -316,8 +313,6 @@
     APSETUILOGGER_ENTERFN( EListbox,"SelPopupList::GetHelpContext")
     
     aContext.iMajor = iHandler->iHelpMajor;
-    // help no longer available for user, use dummy ID
-    aContext.iContext = KSET_HLP_AP_SETTING_GPRS;
     
     APSETUILOGGER_LEAVEFN( EListbox,"SelPopupList::GetHelpContext")
     }

--- a/apengine/apsettingshandlerui/src/ApSelectorDialog.cpp	Fri May 14 10:52:16 2010 +0300
+++ b/apengine/apsettingshandlerui/src/ApSelectorDialog.cpp	Mon May 17 09:55:27 2010 +0300
@@ -29,8 +29,6 @@
 
 #include <featmgr.h>
 
-#include <csxhelp/cp.hlp.hrh>
-
 #include "ApSelectorDialog.h"
 #include "ApSelectorListBoxModel.h"
 #include "ApSelectorListbox.h"
@@ -435,14 +433,12 @@
     APSETUILOGGER_ENTERFN( EDialog,"SelDIalog::GetHelpContext<->")
     
     aContext.iMajor = iHandler->iHelpMajor;
-    // help no longer available for user, use dummy ID
-    aContext.iContext = KSET_HLP_AP_SETTING_GPRS;
     }
 
 
 
 // ---------------------------------------------------------
-// CApSelectorDialog::HandleApDbEventL
+// CApSelectorDialog::HandleApDbEventLw
 // called by the active access point framework
 // ---------------------------------------------------------
 //

--- a/apengine/apsettingshandlerui/src/ApSettingsDlg.cpp	Fri May 14 10:52:16 2010 +0300
+++ b/apengine/apsettingshandlerui/src/ApSettingsDlg.cpp	Mon May 17 09:55:27 2010 +0300
@@ -43,8 +43,6 @@
 #include "ApSettingsModel.h"
 #include <ApSetUI.rsg>
 
-#include <csxhelp/cp.hlp.hrh>
-
 #include "ApSettingsHandlerUI.hrh"
 #include "ApsettingshandleruiImpl.h"
 #include "ApSettingsHandlerConsts.h"
@@ -775,90 +773,6 @@
     APSETUILOGGER_ENTERFN( ESettings,"Settings::GetHelpContext")
     
     aContext.iMajor = iHandler->iHelpMajor;
-    switch ( iBearerType )
-        {
-        case EApBearerTypeCSD:
-        case EApBearerTypeHSCSD:
-            {
-            switch ( iLevel )
-                {
-                case 2:
-                    {
-                    if ( iL2Ipv4 )
-                        {
-                        aContext.iContext = KSET_HLP_AP_DATA_AS_IPV4;
-                        }
-                    else
-                        {
-                        aContext.iContext = KSET_HLP_AP_DATA_AS_IPV6;
-                        }
-                    break;
-                    }
-                case 1:
-                    {
-                    aContext.iContext = KSET_HLP_AP_SETTING_DATA_AS;
-                    break;
-                    }
-                case 0:
-                default:
-                    {
-                    aContext.iContext = KSET_HLP_AP_SETTING_DATA;
-                    break;
-                    }
-                }
-            break;
-            }
-        case EApBearerTypeGPRS:
-            {
-            if ( iLevel )
-                {
-                aContext.iContext = KSET_HLP_AP_SETTING_GPRS_AS;
-                }
-            else
-                {
-                aContext.iContext = KSET_HLP_AP_SETTING_GPRS;
-                }
-            break;
-            }
-        case EApBearerTypeWLAN: 
-            {
-            switch ( iLevel )
-                {
-                case 2:
-                    {
-                    if ( iL2Ipv4 )
-                        {
-                        aContext.iContext = KSET_HLP_AP_WLAN_AS_IPV4;
-                        }
-                    else
-                        {
-                        aContext.iContext = KSET_HLP_AP_WLAN_AS_IPV6;
-                        }
-                    break;
-                    }
-                case 1:
-                    {
-                    aContext.iContext = KSET_HLP_AP_SETTING_WLAN_AS;
-                    break;
-                    }
-                case 0:
-                    {
-                    aContext.iContext = KSET_HLP_AP_SETTING_WLAN;
-                    break;
-                    }
-                default:
-                    {
-                    break;
-                    }
-                }
-            break;
-            }
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EInvalidBearerType ) );
-            break;
-            }
-        }
     
     APSETUILOGGER_LEAVEFN( ESettings,"Settings::GetHelpContext")
     }