Mercurial Mercurial > oss > FCL > sf > mw > accesssec / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:09:54 +0000
branchCompilerCompatibility
changeset 9 f9d585070800
parent 5 a4a71ecffc7d (current diff)
parent 7 7b8801c4c2d9 (diff)
child 13 5431fd16d0e9
Automatic merge from PDK_3.0.h
--- a/wlansecuritysettings/wepsecuritysettingsui/group/wepsecuritysettingsuistub.mmp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wepsecuritysettingsui/group/wepsecuritysettingsuistub.mmp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -17,7 +17,7 @@
 */
 
 /*
-* %version: 3 %
+* %version: 6 %
 */
 
 #include <data_caging_paths.hrh>
@@ -43,9 +43,9 @@
 LIBRARY euser.lib
 
 #if defined( WINSCW )
-    DEFFILE ../BWinsCw/WEPSecuritySettingsUI_EKA2_ALR.def
+    DEFFILE ../bwinscw/WEPSecuritySettingsUI_EKA2_ALR.def
 #else
-    DEFFILE ../EABI/WEPSecuritySettingsUI_EKA2_ALR.def
+    DEFFILE ../eabi/WEPSecuritySettingsUI_EKA2_ALR.def
 #endif
 
 // End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsDlg.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsDlg.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: tr1cfwln#8.1.21 %
+* %version: tr1cfwln#8.1.22 %
 */
 
 // INCLUDE FILES
@@ -42,7 +42,7 @@
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 
 
 // CONSTANT DECLARATIONS
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsImpl.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsImpl.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: tr1cfwln#25 %
+* %version: tr1cfwln#26 %
 */
 
 // INCLUDE FILES
@@ -26,7 +26,7 @@
 
 #include <WEPSecuritySettingsUI.h>
 #include <commdb.h>
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <WlanCdbCols.h>
 
 #include <commsdattypesv1_1.h>
--- a/wlansecuritysettings/wepsecuritysettingsui/src/wepsecuritysettingsstub.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wepsecuritysettingsui/src/wepsecuritysettingsstub.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -17,12 +17,12 @@
 */
 
 /*
-* %version: 2 %
+* %version: 3 %
 */
 
 // INCLUDE FILES
 
-#include <WEPSecuritySettingsUi.h>
+#include <WEPSecuritySettingsUI.h>
 
 
 
--- a/wlansecuritysettings/wepsecuritysettingsui/src/wepsecuritysettingsuistub.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wepsecuritysettingsui/src/wepsecuritysettingsuistub.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -17,12 +17,12 @@
 */
 
 /*
-* %version: 2 %
+* %version: 3 %
 */
 
 // INCLUDE FILES
 
-#include <WEPSecuritySettingsUi.h>
+#include <WEPSecuritySettingsUI.h>
 
 
 
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotactiverunner.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotactiverunner.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: tr1cfwln#28 %
+* %version: tr1cfwln#29 %
 */
 
 //SYSTEM INCLUDES
@@ -52,7 +52,7 @@
 #include "wifiprotenterpindlg.h"
 #include "wifiprotinitiateeasysetupdlg.h"
 
-#include "FeatMgr.h"
+#include "featmgr.h"
 
 // valid Wep key lengths, to check wep key format
 // (wep key format depends on key length)
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUi.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUi.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,13 +16,13 @@
 */
 
 /*
-* %version: 14 %
+* %version: 15 %
 */
 
 // INCLUDE FILES
 #include "EapAkaUi.h"
 #include "EapAkaUiView.h"
-#include <EapAkaUi.rsg>
+#include <eapakaui.rsg>
 #include <bautils.h>
 #include <coemain.h>
 #include <aknnotewrappers.h>
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUiView.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUiView.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 28 %
+* %version: 29 %
 */
 
 // INCLUDE FILES
@@ -25,7 +25,7 @@
 #include <aknlists.h>
 #include "EapAkaUiView.h"
 #include "EapAkaUi.hrh"
-#include <EapAkaUi.rsg>
+#include <eapakaui.rsg>
 #include <akntextsettingpage.h>
 #include <aknsettingitemlist.h>
 #include "EapAkaUiSettingArray.h"
@@ -33,7 +33,7 @@
 #include <EapAkaUiDataConnection.h>
 #include <EapAkaUiAkaData.h> 
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUi.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUi.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,12 +16,12 @@
 */
 
 /*
-* %version: 14 %
+* %version: 15 %
 */
 
 // INCLUDE FILES
 #include <EapGtcUiConnection.h>
-#include <EapGtcUi.rsg>
+#include <eapgtcui.rsg>
 #include <bautils.h>
 #include <coemain.h>
 #include <aknnotewrappers.h>
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUiView.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUiView.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,14 +16,14 @@
 */
 
 /*
-* %version: 27 %
+* %version: 28 %
 */
 
 // INCLUDE FILES
 #include <eikdialg.h>
 #include <AknDialog.h>
 #include <aknlists.h>
-#include <EapGtcUi.rsg>
+#include <eapgtcui.rsg>
 #include <akntextsettingpage.h>
 #include <aknsettingitemlist.h>
 #include <aknnavide.h>
@@ -36,7 +36,7 @@
 #include "EapGtcUi.hrh"
 #include "EapGtcUiSettingArray.h"
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/src/GtcNotifDlgPlugin.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/src/GtcNotifDlgPlugin.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 12.1.8 %
+* %version: 12.1.9 %
 */
 
 // INCLUDE FILES
@@ -24,7 +24,7 @@
 #include <eikenv.h>
 #include <bautils.h>
 #include <data_caging_path_literals.hrh>
-#include <GtcNotifDlgUi.rsg>
+#include <gtcnotifdlgui.rsg>
 #include <e32base.h>
 #include <StringLoader.h>
 
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2Ui.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2Ui.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,14 +16,14 @@
 */
 
 /*
-* %version: 15 %
+* %version: 16 %
 */
 
 // INCLUDE FILES
 #include "EapMschapv2Ui.h"
 #include <EapMsChapV2UiConnection.h>
 #include "EapMschapv2UiView.h"
-#include <EapMschapv2Ui.rsg>
+#include <eapmschapv2ui.rsg>
 #include <bautils.h>
 #include <coemain.h>
 #include <aknnotewrappers.h>
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2UiView.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2UiView.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 28 %
+* %version: 29 %
 */
 
 // INCLUDE FILES
@@ -25,7 +25,7 @@
 #include <aknlists.h>
 #include "EapMschapv2UiView.h"
 #include "EapMschapv2Ui.hrh"
-#include <EapMschapv2Ui.rsg>
+#include <eapmschapv2ui.rsg>
 #include <akntextsettingpage.h>
 #include <aknsettingitemlist.h>
 #include "EapMschapv2UiSettingArray.h"
@@ -35,7 +35,7 @@
 #include <EapMsChapV2UiDataConnection.h>
 #include <EapMsChapV2UiMsChapV2Data.h>
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/src/MsChapv2NotifDialog.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/src/MsChapv2NotifDialog.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,11 +16,11 @@
 */
 
 /*
-* %version: 17 %
+* %version: 18 %
 */
 
 // INCLUDE FILES
-#include <MsChapv2NotifDlgUi.rsg>
+#include <mschapv2notifdlgui.rsg>
 #include "MsChapv2NotifDlgPlugin.h"
 #include "MsChapv2NotifDialog.h"
 
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/src/MsChapv2NotifDlgPlugin.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/src/MsChapv2NotifDlgPlugin.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 12.1.7 %
+* %version: 12.1.8 %
 */
 
 // INCLUDE FILES
@@ -24,7 +24,7 @@
 #include <eikenv.h>
 #include <bautils.h>
 #include <data_caging_path_literals.hrh>
-#include <MsChapv2NotifDlgUi.rsg>
+#include <mschapv2notifdlgui.rsg>
 
 #include <e32property.h>		// For RProperty 
 #include <UikonInternalPSKeys.h> // For KPSUidUikon and KUikGlobalNotesAllowed.
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUi.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUi.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,14 +16,14 @@
 */
 
 /*
-* %version: 14 %
+* %version: 15 %
 */
 
 // INCLUDE FILES
 #include "EapPeapUi.h"
 #include "EapTlsPeapUiConnection.h"
 #include "EapPeapUiView.h"
-#include <EapPeapUi.rsg>
+#include <eappeapui.rsg>
 #include <bautils.h>
 #include <coemain.h>
 #include <aknnotewrappers.h>
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUiView.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUiView.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 37.1.7 %
+* %version: 37.1.8 %
 */
 
 // INCLUDE FILES
@@ -25,7 +25,7 @@
 #include <aknlists.h>
 #include "EapPeapUiView.h"
 #include "EapPeapUi.hrh"
-#include <EapPeapUi.rsg>
+#include <eappeapui.rsg>
 #include <akntextsettingpage.h>
 #include <aknsettingitemlist.h>
 #include "EapPeapUiSettingArray.h"
@@ -45,7 +45,7 @@
 #include <EapTypeInfo.h> // For EAP type info query
 #include <AknIconArray.h>
 #include <AknsUtils.h>
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPlugInConfigurationDlg.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPlugInConfigurationDlg.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 20.1.14 %
+* %version: 20.1.15 %
 */
 
 // INCLUDE FILES
@@ -29,7 +29,7 @@
 #include <aknnotewrappers.h>
 #include <EapType.h>
 
-#include <EAPPluginConfigRes.rsg>
+#include <eappluginconfigres.rsg>
 #include "EAPPluginConfig.hrh"
 
 #include <avkon.mbg>
@@ -39,7 +39,7 @@
 #include "EAPPluginConfigurationModel.h"
 
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <eikappui.h>
 #include <csxhelp/cp.hlp.hrh>
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPluginConfiguration.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPluginConfiguration.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 23 %
+* %version: 24 %
 */
 
 // INCLUDE FILES
@@ -29,7 +29,7 @@
 
 #include <ecom/ecom.h>
 #include <data_caging_path_literals.hrh>
-#include <EAPPluginConfigRes.rsg>
+#include <eappluginconfigres.rsg>
 
 // CONSTANTS
 _LIT( KDriveZ, "z:" );                               // ROM folder
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUi.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUi.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,14 +16,14 @@
 */
 
 /*
-* %version: 14 %
+* %version: 15 %
 */
 
 // INCLUDE FILES
 #include "EapSimUi.h"
 #include <EapSimUiConnection.h>
 #include "EapSimUiView.h"
-#include <EapSimUi.rsg>
+#include <eapsimui.rsg>
 #include <bautils.h>
 #include <coemain.h>
 #include <aknnotewrappers.h>
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUiView.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUiView.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 28 %
+* %version: 29 %
 */
 
 // INCLUDE FILES
@@ -25,7 +25,7 @@
 #include <aknlists.h>
 #include "EapSimUiView.h"
 #include "EapSimUi.hrh"
-#include <EapSimUi.rsg>
+#include <eapsimui.rsg>
 #include <akntextsettingpage.h>
 #include <aknsettingitemlist.h>
 #include "EapSimUiSettingArray.h"
@@ -35,7 +35,7 @@
 #include <EapSimUiDataConnection.h>
 #include <EapSimUiSimData.h>
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUi.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUi.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,14 +16,14 @@
 */
 
 /*
-* %version: 14 %
+* %version: 15 %
 */
 
 // INCLUDE FILES
 #include "EapTlsUi.h"
 #include "EapTlsPeapUiConnection.h"
 #include "EapTlsUiView.h"
-#include <EapTlsUi.rsg>
+#include <eaptlsui.rsg>
 #include <bautils.h>
 #include <coemain.h>
 #include <aknnotewrappers.h>
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUiView.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUiView.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 40 %
+* %version: 41 %
 */
 
 // INCLUDE FILES
@@ -25,7 +25,7 @@
 #include <aknlists.h>
 #include "EapTlsUiView.h"
 #include "EapTlsUi.hrh"
-#include <EapTlsUi.rsg>
+#include <eaptlsui.rsg>
 #include <akntextsettingpage.h>
 #include <aknsettingitemlist.h>
 #include "EapTlsUiSettingArray.h"
@@ -42,7 +42,7 @@
 #include <AknIconArray.h>
 #include <AknsUtils.h>
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUi.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUi.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,13 +16,13 @@
 */
 
 /*
-* %version: 14 %
+* %version: 15 %
 */
 
 // INCLUDE FILES
 #include "EapTtlsUi.h"
 #include "EapTtlsUiView.h"
-#include <EapTtlsUi.rsg>
+#include <eapttlsui.rsg>
 #include <bautils.h>
 #include <coemain.h>
 #include <aknnotewrappers.h>
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUiView.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUiView.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 27.1.1.1.8 %
+* %version: 27.1.1.1.9 %
 */
 
 // INCLUDE FILES
@@ -25,7 +25,7 @@
 #include <aknlists.h>
 #include "EapTtlsUiView.h"
 #include "EapTtlsUi.hrh"
-#include <EapTtlsUi.rsg>
+#include <eapttlsui.rsg>
 #include <akntextsettingpage.h>
 #include <aknsettingitemlist.h>
 #include "EapTtlsUiSettingArray.h"
@@ -43,7 +43,7 @@
 #include <AknIconArray.h>
 #include <AknsUtils.h>
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papuiview.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papuiview.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 12 %
+* %version: 13 %
 */
 
 // INCLUDE FILES
@@ -37,7 +37,7 @@
 #include <EapTlsPeapUiConnection.h>
 #include <EapTlsPeapUiDataConnection.h>
 #include <EapTlsPeapUiTlsPeapData.h>
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <hlplch.h>
 #include <csxhelp/cp.hlp.hrh>
 
--- a/wlansecuritysettings/wpasecuritysettingsui/group/wpasecuritysettingsuistub.mmp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wpasecuritysettingsui/group/wpasecuritysettingsuistub.mmp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -17,7 +17,7 @@
 */
 
 /*
-* %version: 3 %
+* %version: 6 %
 */
 
 #include <data_caging_paths.hrh>
@@ -44,9 +44,9 @@
 LIBRARY euser.lib
 
 #if defined(ARMCC)
-    DEFFILE ../EABI/WPASecuritySettingsUI_EKA2_ALR.def
+    DEFFILE ../eabi/WPASecuritySettingsUI_EKA2_ALR.def
 #elif defined( WINSCW )
-    DEFFILE ../BWinsCw/WPASecuritySettingsUI_EKA2_ALR.def
+    DEFFILE ../bwinscw/WPASecuritySettingsUI_EKA2_ALR.def
 #endif
 
 // End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsDlg.cpp	Fri Feb 26 14:41:41 2010 +0000
+++ b/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsDlg.cpp	Sun Mar 14 13:09:54 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: tr1cfwln#30 %
+* %version: tr1cfwln#31 %
 */
 
 // INCLUDE FILES
@@ -30,7 +30,7 @@
 #include <csxhelp/cp.hlp.hrh>
 #include <hlplch.h>
 
-#include <FeatMgr.h>
+#include <featmgr.h>
 
 #include <akntitle.h>
 #include <aknradiobuttonsettingpage.h>
FCL/sf/mw/accesssec