--- a/classicui_pub/aiw_generic_parameter_api/inc/AiwVariant.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/classicui_pub/aiw_generic_parameter_api/inc/AiwVariant.h	Tue Jun 15 15:06:09 2010 +0100
@@ -112,7 +112,7 @@
         *
         * @param aValue The source object.
         */
-        IMPORT_C TAiwVariant& TAiwVariant::operator=(const TAiwVariant& aValue);
+        IMPORT_C TAiwVariant& operator=(const TAiwVariant& aValue);
 
         // This class does not need a destructor because memory allocation
         // policy for variant class has been implemented by TAiwGenericParam

--- a/classicui_pub/editors_api/inc/EIKEDWIN.H	Fri Jun 11 16:24:49 2010 +0100
+++ b/classicui_pub/editors_api/inc/EIKEDWIN.H	Tue Jun 15 15:06:09 2010 +0100
@@ -1561,7 +1561,7 @@
          * @return editor flags if existed
          * @or return KErrNotFound
          */
-    IMPORT_C TInt CEikEdwin::AknEditorFlags();
+    IMPORT_C TInt AknEditorFlags();
     
 
 	

--- a/classicui_pub/ui_framework_utilities_api/inc/AknBidiTextUtils.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/classicui_pub/ui_framework_utilities_api/inc/AknBidiTextUtils.h	Tue Jun 15 15:06:09 2010 +0100
@@ -422,7 +422,7 @@
     * @param aOrder Whether the text provided is in visual or logical order
     * @return       width of the text in pixels.
     */
-    IMPORT_C static TInt AknBidiTextUtils::MeasureTextBoundsWidth(
+    IMPORT_C static TInt MeasureTextBoundsWidth(
         const CFont& aFont,
         const TDesC& aText,
         CFont::TMeasureTextInput::TFlags aOrder);

--- a/classicui_pub/volume_control_api/inc/Aknvolumecontrol.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/classicui_pub/volume_control_api/inc/Aknvolumecontrol.h	Tue Jun 15 15:06:09 2010 +0100
@@ -270,7 +270,7 @@
         *
         * @return Colume value scaled to range of [0-10].
         */
-        TInt CAknVolumeControl::ScaledValue() const;
+        TInt ScaledValue() const;
 
        /*
         * Set extended touch area to be used 

--- a/commonuisupport/uikon/coresrc/eikprivate.cpp	Fri Jun 11 16:24:49 2010 +0100
+++ b/commonuisupport/uikon/coresrc/eikprivate.cpp	Tue Jun 15 15:06:09 2010 +0100
@@ -25,7 +25,7 @@
 	{ // static
 	const TInt maxLength = Max(KMaxFileName, aString.Length());
 	// Get the mempory required
-	TUnlimitedFileName* const fakeFileName = STATIC_CAST(TUnlimitedFileName*, User::AllocLC(_FOFF(TUnlimitedFileName, iBuf[maxLength])));
+	TUnlimitedFileName* const fakeFileName = STATIC_CAST(TUnlimitedFileName*, User::AllocLC(_FOFF_DYNAMIC(TUnlimitedFileName, iBuf[maxLength])));
 	// Create the TUnlimitedFileName object inside the memory
 	new(fakeFileName) TUnlimitedFileName(aString, maxLength);
 	return fakeFileName;

--- a/uifw/AknGlobalUI/AknCapServer/inc/AknEikSgcs.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AknGlobalUI/AknCapServer/inc/AknEikSgcs.h	Tue Jun 15 15:06:09 2010 +0100
@@ -124,7 +124,7 @@
     void SetLayoutL(TInt aSpIndex);
     static TInt RemoveBlankCallBack(TAny* aThis);
     void DoRemoveBlank();
-    static TInt CEikSgcServer::RestoreThreadPriorities(TAny* aThis);
+    static TInt RestoreThreadPriorities(TAny* aThis);
     void DoRestoreThreadPriorities();
     void ActivateEffectL();
     void SetLayoutBlankScreenL(TBool aBlank, TInt aStep);

--- a/uifw/AknGlobalUI/AknCapServer/inc/AknKeyFilter.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AknGlobalUI/AknCapServer/inc/AknKeyFilter.h	Tue Jun 15 15:06:09 2010 +0100
@@ -50,7 +50,7 @@
     void FreeHardwareStateKeys();
     void SetHardwareStateL(TInt aState);
 #ifdef RD_INTELLIGENT_TEXT_INPUT
-    TInt CAknServKeyFilter::HwKeyToKeyBoardType(TInt aKeyCode);
+    TInt HwKeyToKeyBoardType(TInt aKeyCode);
 #endif
 
 private:

--- a/uifw/AvKon/AknExtendedFader/group/bld.inf	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AvKon/AknExtendedFader/group/bld.inf	Tue Jun 15 15:06:09 2010 +0100
@@ -27,10 +27,10 @@
 
 PRJ_MMPFILES
 
-#if defined(WINSCW)
-aknextendedfader_winscw.mmp
-#else
+#if defined(ARMV5)
 aknextendedfader_armv5.mmp
 aknextendedfader_arm11.mmp
+#else
+aknextendedfader_winscw.mmp
 #endif
 

--- a/uifw/AvKon/Avkon2MifHeader/avkon2mifheader_inst.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AvKon/Avkon2MifHeader/avkon2mifheader_inst.h	Tue Jun 15 15:06:09 2010 +0100
@@ -1,37 +1,37 @@
-/*
-* Copyright (c) 2009 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: 
-*
-*/
-
-// This header file contains the customisation implementation identity for Avkon2MifHeader_inst
-// It was generated by:
-// MifToCdlIndex -p..\Avkon2MifHeader \epoc32\data\z\resource\apps\avkon2.mif Avkon2MifHeader 0x102827CF
-// This file may be manually modified.
-
-#ifndef AVKON2MIFHEADER_INST_H
-#define AVKON2MIFHEADER_INST_H
-#include "mifheader.cdl.custom.h"
-#include "avkon2mifheader_inst.hrh"
-
-namespace Avkon2MifHeader_inst
-{
-
-const TInt KCdlInstanceId = _CDL_Avkon2MifHeader_inst_KCdlInstanceId;
-using MifHeader::KCdlInterface;
-using MifHeader::KCdlInterfaceUidValue;
-GLREF_D const MifHeader::SCdlImpl KCdlImpl;
-
-} // end of namespace Avkon2MifHeader_inst
-#endif // AVKON2MIFHEADER_INST_H
+/*
+* Copyright (c) 2009 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:
+*
+*/
+
+// This header file contains the customisation implementation identity for Avkon2MifHeader_inst
+// It was generated by:
+// miftocdlindex -pM:/sf/mw/classicui/uifw/avkon/group/../Avkon2MifHeader -s M:/epoc32/data/Z/resource/apps/avkon2.mif Avkon2MifHeader 0x102827CF
+// This file may be manually modified.
+
+#ifndef AVKON2MIFHEADER_INST_H
+#define AVKON2MIFHEADER_INST_H
+#include "mifheader.cdl.custom.h"
+#include "avkon2mifheader_inst.hrh"
+
+namespace Avkon2MifHeader_inst
+{
+
+const TInt KCdlInstanceId = _CDL_Avkon2MifHeader_inst_KCdlInstanceId;
+using MifHeader::KCdlInterface;
+using MifHeader::KCdlInterfaceUidValue;
+GLREF_D const MifHeader::SCdlImpl KCdlImpl;
+
+} // end of namespace Avkon2MifHeader_inst
+#endif // AVKON2MIFHEADER_INST_H

--- a/uifw/AvKon/Avkon2MifHeader/avkon2mifheader_inst.hrh	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AvKon/Avkon2MifHeader/avkon2mifheader_inst.hrh	Tue Jun 15 15:06:09 2010 +0100
@@ -1,31 +1,31 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-// This header file contains the customisation implementation identity for Avkon2MifHeader_inst
-// It was generated by:
-// MifToCdlIndex -p../Avkon2MifHeader /epoc32/data/z/resource/apps/avkon2.mif Avkon2MifHeader 0x102827CF
-// This file may be manually modified.
-
-#ifndef AVKON2MIFHEADER_INST_HRH
-#define AVKON2MIFHEADER_INST_HRH
-#include "mifheader.cdl.common.hrh"
-#include "dllinstances.hrh"
-
-#define _CDL_Avkon2MifHeader_inst_KCdlInstanceInterfaceUidValue _CDL_MifHeader_KCdlInterfaceUidValue
-#define _CDL_Avkon2MifHeader_inst_KCdlInstanceId KDllInst_Avkon2MifHeader_inst
-
-#endif // AVKON2MIFHEADER_INST_HRH
+/*
+* Copyright (c) 2009 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:
+*
+*/
+
+// This header file contains the customisation implementation identity for Avkon2MifHeader_inst
+// It was generated by:
+// miftocdlindex -pM:/sf/mw/classicui/uifw/avkon/group/../Avkon2MifHeader -s M:/epoc32/data/Z/resource/apps/avkon2.mif Avkon2MifHeader 0x102827CF
+// This file may be manually modified.
+
+#ifndef AVKON2MIFHEADER_INST_HRH
+#define AVKON2MIFHEADER_INST_HRH
+#include "mifheader.cdl.common.hrh"
+#include "dllinstances.hrh"
+
+#define _CDL_Avkon2MifHeader_inst_KCdlInstanceInterfaceUidValue _CDL_MifHeader_KCdlInterfaceUidValue
+#define _CDL_Avkon2MifHeader_inst_KCdlInstanceId KDllInst_Avkon2MifHeader_inst
+
+#endif // AVKON2MIFHEADER_INST_HRH

--- a/uifw/AvKon/Avkon2MifHeader/mifheader.cdl.common.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AvKon/Avkon2MifHeader/mifheader.cdl.common.h	Tue Jun 15 15:06:09 2010 +0100
@@ -1,75 +1,74 @@
-/*
-* Copyright (c) 2009 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: 
-*
-*/
-
-// This file was automatically generated from \epoc32\include\oem\mifheader.cdl.
-// It contains common definitions for the client and customisation API.
-// It should not be modified manually.
-
-#ifndef MIFHEADER_CDL_COMMON_H
-#define MIFHEADER_CDL_COMMON_H
-
-
-// from AknIconLoader.h
-// In MIF file version 2+, bitmap icons are identified in the bitmap offset array
-// with iOffset being <=0. In that case, -iOffset means the corresponding MBM ID,
-// which can be used for CFbsBitmap::Load.
-
-struct TMifBitmapOffsetElement
-    {
-    TInt32 iOffset; // pointer to icon. icon = header + data.
-    TInt32 iLength; // combined length of TMifIconHeader and its data.
-    };
-
-
-namespace MifHeader
-{
-#include "mifheader.cdl.common.hrh"
-
-// These constants are defined by the CDL interface: MifHeader
-_LIT(KCdlName, "MifHeader");
-const TInt KCdlInterfaceUidValue = _CDL_MifHeader_KCdlInterfaceUidValue;
-const TUid KCdlInterfaceUid = { KCdlInterfaceUidValue };
-const TInt KCdlInterfaceMajorVersion = 1;
-const TInt KCdlInterfaceMinorVersion = 0;
-const TUint KCdlInterfaceFlags = 0;
-
-// These are the API ids used in this interface.
-enum TApiId
-	{
-	EApiId_indicies,
-	E_TApiId_TableSize
-	};
-
-// This is the CDL interface definition for this interface
-const SCdlInterface KCdlInterface =
-	{
-	KCdlCompilerMajorVersion,
-	KCdlCompilerMinorVersion,
-	LIT_AS_DESC_PTR(KCdlName),
-	{ KCdlInterfaceUidValue },
-	KCdlInterfaceMajorVersion,
-	KCdlInterfaceMinorVersion,
-	KCdlInterfaceFlags,
-	E_TApiId_TableSize
-	};
-
-// These typedefs define the types for function APIs
-// TCdlArray<TMifBitmapOffsetElement> indicies 	does not need a typedef
-
-} // end of namespace MifHeader
-
-#endif // MIFHEADER_CDL_COMMON_H
+/*
+* Copyright (c) 2009 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:
+*
+*/
+
+// It contains common definitions for the client and customisation API.
+// It should not be modified manually.
+
+#ifndef MIFHEADER_CDL_COMMON_H
+#define MIFHEADER_CDL_COMMON_H
+
+
+// from AknIconLoader.h
+// In MIF file version 2+, bitmap icons are identified in the bitmap offset array
+// with iOffset being <=0. In that case, -iOffset means the corresponding MBM ID,
+// which can be used for CFbsBitmap::Load.
+
+struct TMifBitmapOffsetElement
+    {
+    TInt32 iOffset; // pointer to icon. icon = header + data.
+    TInt32 iLength; // combined length of TMifIconHeader and its data.
+    };
+
+
+namespace MifHeader
+{
+#include "mifheader.cdl.common.hrh"
+
+// These constants are defined by the CDL interface: MifHeader
+_LIT(KCdlName, "MifHeader");
+const TInt KCdlInterfaceUidValue = _CDL_MifHeader_KCdlInterfaceUidValue;
+const TUid KCdlInterfaceUid = { KCdlInterfaceUidValue };
+const TInt KCdlInterfaceMajorVersion = 1;
+const TInt KCdlInterfaceMinorVersion = 0;
+const TUint KCdlInterfaceFlags = 0;
+
+// These are the API ids used in this interface.
+enum TApiId
+	{
+	EApiId_indicies,
+	E_TApiId_TableSize
+	};
+
+// This is the CDL interface definition for this interface
+const SCdlInterface KCdlInterface =
+	{
+	KCdlCompilerMajorVersion,
+	KCdlCompilerMinorVersion,
+	LIT_AS_DESC_PTR(KCdlName),
+	{ KCdlInterfaceUidValue },
+	KCdlInterfaceMajorVersion,
+	KCdlInterfaceMinorVersion,
+	KCdlInterfaceFlags,
+	E_TApiId_TableSize
+	};
+
+// These typedefs define the types for function APIs
+// TCdlArray<TMifBitmapOffsetElement> indicies 	does not need a typedef
+
+} // end of namespace MifHeader
+
+#endif // MIFHEADER_CDL_COMMON_H

--- a/uifw/AvKon/Avkon2MifHeader/mifheader.cdl.common.hrh	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AvKon/Avkon2MifHeader/mifheader.cdl.common.hrh	Tue Jun 15 15:06:09 2010 +0100
@@ -1,29 +1,28 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-// This file was automatically generated from /epoc32/include/oem/mifheader.cdl.
-// It contains common definitions for the client and customisation API.
-// It should not be modified manually.
-
-#ifndef MIFHEADER_CDL_COMMON_HRH
-#define MIFHEADER_CDL_COMMON_HRH
-
-// These constants are defined by the CDL interface: MifHeader
-#define _CDL_MifHeader_KCdlInterfaceUidValue 0x102827ce
-
-
-#endif // MIFHEADER_CDL_COMMON_HRH
+/*
+* Copyright (c) 2009 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:
+*
+*/
+
+// It contains common definitions for the client and customisation API.
+// It should not be modified manually.
+
+#ifndef MIFHEADER_CDL_COMMON_HRH
+#define MIFHEADER_CDL_COMMON_HRH
+
+// These constants are defined by the CDL interface: MifHeader
+#define _CDL_MifHeader_KCdlInterfaceUidValue 0x102827ce
+
+
+#endif // MIFHEADER_CDL_COMMON_HRH

--- a/uifw/AvKon/Avkon2MifHeader/mifheader.cdl.custom.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AvKon/Avkon2MifHeader/mifheader.cdl.custom.h	Tue Jun 15 15:06:09 2010 +0100
@@ -1,51 +1,51 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-// This file was generated from MifHeader.cdl.
-// It contains the customisation API.
-// It should not be modified manually.
-
-#ifndef MIFHEADER_CDL_CUSTOM_H
-#define MIFHEADER_CDL_CUSTOM_H
-
-#include <CdlEngDef.h>
-#include "mifheader.cdl.common.h"
-
-namespace MifHeader
-{
-
-// This structure defines the interface to a customisation instance.
-// A customisation instance must supply an instance of this structure, with the pointer
-// members either being NULL, or pointing at functions or data of the correct type.
-
-#ifdef __WINS__
-struct SCdlImpl0
-#else
-struct SCdlImpl
-#endif
-	{
-	TCdlArray<TMifBitmapOffsetElement> const* indicies;
-	};
-#ifdef __WINS__
-struct SCdlImpl
-	{
-	SCdlImpl0 i0;
-	};
-#endif
-
-} // end of namespace MifHeader
-#endif // MIFHEADER_CDL_CUSTOM_H
+/*
+* Copyright (c) 2009 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:
+*
+*/
+
+// This file was generated from MifHeader.cdl.
+// It contains the customisation API.
+// It should not be modified manually.
+
+#ifndef MIFHEADER_CDL_CUSTOM_H
+#define MIFHEADER_CDL_CUSTOM_H
+
+#include <cdlengdef.h>
+#include "mifheader.cdl.common.h"
+
+namespace MifHeader
+{
+
+// This structure defines the interface to a customisation instance.
+// A customisation instance must supply an instance of this structure, with the pointer
+// members either being NULL, or pointing at functions or data of the correct type.
+
+#ifdef __WINS__
+struct SCdlImpl0
+#else
+struct SCdlImpl
+#endif
+	{
+	TCdlArray<TMifBitmapOffsetElement> const* indicies;
+	};
+#ifdef __WINS__
+struct SCdlImpl
+	{
+	SCdlImpl0 i0;
+	};
+#endif
+
+} // end of namespace MifHeader
+#endif // MIFHEADER_CDL_CUSTOM_H

--- a/uifw/AvKon/akncompamode/inc/akncompautils.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/uifw/AvKon/akncompamode/inc/akncompautils.h	Tue Jun 15 15:06:09 2010 +0100
@@ -73,7 +73,7 @@
     static TBool IsEikSrv(TSecureId aSecureId);
     static TBool IsAknCapSrv(TSecureId aSecureId);
 
-    static void AknCompaUtils::ReadButtonsL(
+    static void ReadButtonsL(
         RPointerArray<CAknCompaButton>& aButtons, TInt& aPenButton,
         CCoeEnv& aCoeEnv);
 

--- a/uiutils/Findutil/inc/FindUtilWestern.h	Fri Jun 11 16:24:49 2010 +0100
+++ b/uiutils/Findutil/inc/FindUtilWestern.h	Tue Jun 15 15:06:09 2010 +0100
@@ -114,7 +114,7 @@
          * From CFindUtilBase. Overrides the base function to find the input language
          * @since 3.1
          */
-        void CFindUtilWestern::OpenL();
+        void OpenL();
 	private:
         /**
         * Derived from MCenRepNotifyHandlerCallback