# HG changeset patch # User Stefan Karlsson # Date 1269790702 -3600 # Node ID 99825dc91d839fc166a5e4a37841e63b9cab7ba6 # Parent d85d729aebdcd8ddd6cb8fc136493b2752b98774 Fixed "extra qualification" syntax errors. diff -r d85d729aebdc -r 99825dc91d83 skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.common.h --- a/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.common.h Tue Mar 23 15:58:23 2010 +0000 +++ b/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.common.h Sun Mar 28 16:38:22 2010 +0100 @@ -1,74 +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 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 indicies does not need a typedef + +} // end of namespace MifHeader + +#endif // MIFHEADER_CDL_COMMON_H diff -r d85d729aebdc -r 99825dc91d83 skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.common.hrh --- a/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.common.hrh Tue Mar 23 15:58:23 2010 +0000 +++ b/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.common.hrh Sun Mar 28 16:38:22 2010 +0100 @@ -1,28 +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 diff -r d85d729aebdc -r 99825dc91d83 skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.custom.h --- a/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.custom.h Tue Mar 23 15:58:23 2010 +0000 +++ b/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/mifheader.cdl.custom.h Sun Mar 28 16:38:22 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 -#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 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 +#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 const* indicies; + }; +#ifdef __WINS__ +struct SCdlImpl + { + SCdlImpl0 i0; + }; +#endif + +} // end of namespace MifHeader +#endif // MIFHEADER_CDL_CUSTOM_H diff -r d85d729aebdc -r 99825dc91d83 skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/series60skinindexdll_inst.h --- a/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/series60skinindexdll_inst.h Tue Mar 23 15:58:23 2010 +0000 +++ b/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/series60skinindexdll_inst.h Sun Mar 28 16:38:22 2010 +0100 @@ -1,36 +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 series60skinIndexDll_inst -// It was generated by: -// MifToCdlIndex -p..\..\srcdata\scalableseries60skin\MifIndexDll series60skin.mif series60skinIndexDll 0x101f84b9 -// This file may be manually modified. - -#ifndef SERIES60SKININDEXDLL_INST_H -#define SERIES60SKININDEXDLL_INST_H -#include "mifheader.cdl.custom.h" -#include "series60skinindexdll_inst.hrh" - -namespace series60skinIndexDll_inst -{ - -const TInt KCdlInstanceId = _CDL_series60skinIndexDll_inst_KCdlInstanceId; -using MifHeader::KCdlInterface; -using MifHeader::KCdlInterfaceUidValue; -GLREF_D const MifHeader::SCdlImpl KCdlImpl; - -} // end of namespace series60skinIndexDll_inst -#endif // SERIES60SKININDEXDLL_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 series60skinIndexDll_inst +// It was generated by: +// miftocdlindex -pG:/sf/mw/uiresources/skins/aknskincontent/group/../srcdata/scalableseries60skin/MifIndexDll -s G:/epoc32/data/z/resource/skins/101f84b9/series60skin.mif series60skinIndexDll 0x101f84b9 +// This file may be manually modified. + +#ifndef SERIES60SKININDEXDLL_INST_H +#define SERIES60SKININDEXDLL_INST_H +#include "mifheader.cdl.custom.h" +#include "series60skinindexdll_inst.hrh" + +namespace series60skinIndexDll_inst +{ + +const TInt KCdlInstanceId = _CDL_series60skinIndexDll_inst_KCdlInstanceId; +using MifHeader::KCdlInterface; +using MifHeader::KCdlInterfaceUidValue; +GLREF_D const MifHeader::SCdlImpl KCdlImpl; + +} // end of namespace series60skinIndexDll_inst +#endif // SERIES60SKININDEXDLL_INST_H diff -r d85d729aebdc -r 99825dc91d83 skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/series60skinindexdll_inst.hrh --- a/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/series60skinindexdll_inst.hrh Tue Mar 23 15:58:23 2010 +0000 +++ b/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll/series60skinindexdll_inst.hrh Sun Mar 28 16:38:22 2010 +0100 @@ -1,30 +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 series60skinIndexDll_inst -// It was generated by: -// MifToCdlIndex -p../../srcdata/scalableseries60skin/MifIndexDll series60skin.mif series60skinIndexDll 0x101f84b9 -// This file may be manually modified. - -#ifndef SERIES60SKININDEXDLL_INST_HRH -#define SERIES60SKININDEXDLL_INST_HRH -#include "mifheader.cdl.common.hrh" -#include "dllinstances.hrh" - -#define _CDL_series60skinIndexDll_inst_KCdlInstanceInterfaceUidValue _CDL_MifHeader_KCdlInterfaceUidValue -#define _CDL_series60skinIndexDll_inst_KCdlInstanceId KDllInst_series60skinIndexDll_inst - -#endif // SERIES60SKININDEXDLL_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 series60skinIndexDll_inst +// It was generated by: +// miftocdlindex -pG:/sf/mw/uiresources/skins/aknskincontent/group/../srcdata/scalableseries60skin/MifIndexDll -s G:/epoc32/data/z/resource/skins/101f84b9/series60skin.mif series60skinIndexDll 0x101f84b9 +// This file may be manually modified. + +#ifndef SERIES60SKININDEXDLL_INST_HRH +#define SERIES60SKININDEXDLL_INST_HRH +#include "mifheader.cdl.common.hrh" +#include "dllinstances.hrh" + +#define _CDL_series60skinIndexDll_inst_KCdlInstanceInterfaceUidValue _CDL_MifHeader_KCdlInterfaceUidValue +#define _CDL_series60skinIndexDll_inst_KCdlInstanceId KDllInst_series60skinIndexDll_inst + +#endif // SERIES60SKININDEXDLL_INST_HRH diff -r d85d729aebdc -r 99825dc91d83 uigraphics/AknIcon/srvinc/AknIconSrvDef.h --- a/uigraphics/AknIcon/srvinc/AknIconSrvDef.h Tue Mar 23 15:58:23 2010 +0000 +++ b/uigraphics/AknIcon/srvinc/AknIconSrvDef.h Sun Mar 28 16:38:22 2010 +0100 @@ -80,7 +80,7 @@ EFlagDisableCompression = 0x0008 // disable bitmap compression }; - TAknIconParams::TAknIconParams():iFlags(0) + TAknIconParams():iFlags(0) { } diff -r d85d729aebdc -r 99825dc91d83 uiresources_plat/extended_fonts_api/inc/AknFontId.h --- a/uiresources_plat/extended_fonts_api/inc/AknFontId.h Tue Mar 23 15:58:23 2010 +0000 +++ b/uiresources_plat/extended_fonts_api/inc/AknFontId.h Sun Mar 28 16:38:22 2010 +0100 @@ -51,7 +51,7 @@ * * @return Encoded Avkon font id */ - IMPORT_C static TInt TAknFontId::FontIdForStartupNormalFont(); + IMPORT_C static TInt FontIdForStartupNormalFont(); }; #endif // AKNFONTID_H