# HG changeset patch # User hgs # Date 1287070508 -10800 # Node ID 5dafecb0892a2b7f33c8df9f463031505a887c1c # Parent 57d26d31c59548753424e63e8b610b2132551abc 201041 diff -r 57d26d31c595 -r 5dafecb0892a package_definition.xml --- a/package_definition.xml Tue Sep 28 14:40:28 2010 +0300 +++ b/package_definition.xml Thu Oct 14 18:35:08 2010 +0300 @@ -5,17 +5,17 @@ - + - + - + diff -r 57d26d31c595 -r 5dafecb0892a uiaccelerator_plat/alf_client_server_api/group/bld.inf --- a/uiaccelerator_plat/alf_client_server_api/group/bld.inf Tue Sep 28 14:40:28 2010 +0300 +++ b/uiaccelerator_plat/alf_client_server_api/group/bld.inf Thu Oct 14 18:35:08 2010 +0300 @@ -16,17 +16,40 @@ * */ +// The new Symbian Build System (SBS, Raptor) gives warnings from ## +// concatenation. Use __GNUC__ >= 3 to check the SBS version! +#ifndef __SERIES60_30__ +#include +#if __GNUC__ >= 3 +#define CORETOOLKIT_EXPORT_FOLDER(P) ../P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S +#else +#define CORETOOLKIT_EXPORT_FOLDER(P) ../##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S -#include +#endif +#else +#if __GNUC__ >= 3 +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S +#else +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/##S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#endif PRJ_PLATFORMS DEFAULT PRJ_EXPORTS -../inc/alf/alfappserver.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfappserver.h) -../inc/alf/alfappsrvsessionbase.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfappsrvsessionbase.h) +../inc/alf/alfappserver.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfappserver.h) +../inc/alf/alfappsrvsessionbase.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfappsrvsessionbase.h) +// For Goom startup ../inc/alf/alfclientbase.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfclientbase.h) -../inc/alf/alfappui.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfappui.h) -../inc/alf/alfdirectclient.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfdirectclient.h) \ No newline at end of file +../inc/alf/alfappui.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfappui.h) +../inc/alf/alfdirectclient.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfdirectclient.h) \ No newline at end of file diff -r 57d26d31c595 -r 5dafecb0892a uiaccelerator_plat/alf_core_toolkit_api/group/bld.inf --- a/uiaccelerator_plat/alf_core_toolkit_api/group/bld.inf Tue Sep 28 14:40:28 2010 +0300 +++ b/uiaccelerator_plat/alf_core_toolkit_api/group/bld.inf Thu Oct 14 18:35:08 2010 +0300 @@ -24,16 +24,23 @@ #include #if __GNUC__ >= 3 #define CORETOOLKIT_EXPORT_FOLDER(P) ../P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S + #else #define CORETOOLKIT_EXPORT_FOLDER(P) ../##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + #endif #else #if __GNUC__ >= 3 #define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/S #define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S #else #define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/##S #define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + #endif #endif @@ -42,94 +49,94 @@ PRJ_EXPORTS -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextureIf.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTextureIf.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiAnimatedTexture.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiAnimatedTexture.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiMappingFunctions.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiMappingFunctions.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTimedPoint.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTimedPoint.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBorderBrush.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiBorderBrush.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextureProcessor.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTextureProcessor.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiImageBrush.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiImageBrush.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiMaterial.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiMaterial.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDisplay.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiDisplay.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTexture.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTexture.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiImage.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiImage.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiGc.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiGc.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiPanic.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiPanic.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBrushArray.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiBrushArray.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huitk.hrh) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huitk.hrh) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiMesh.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiMesh.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huiframebrush.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huiframebrush.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huiproceduralmesh.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huiproceduralmesh.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiAnchorLayout.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiAnchorLayout.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiImageLoaderUtil.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiImageLoaderUtil.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huieventhandler.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huieventhandler.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huigifanimationtexture.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huigifanimationtexture.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huiskinanimationtexture.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huiskinanimationtexture.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiEnv.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiEnv.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDropShadowBrush.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiDropShadowBrush.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDisplayCoeControl.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiDisplayCoeControl.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiVisuals.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiVisuals.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiUtil.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiUtil.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huifixmath.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huifixmath.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextVisual.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTextVisual.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextStyleManager.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huitextstylemanager.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiControl.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiControl.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiLayout.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiLayout.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/hitchcock.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/hitchcock.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiFont.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiFont.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBrushes.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiBrushes.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextStyle.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huitextstyle.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huiviewportlayout.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huiviewportlayout.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huimetric.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huimetric.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextureHandle.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTextureHandle.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDeckLayout.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiDeckLayout.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiGradientBrush.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiGradientBrush.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiStatic.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiStatic.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCurvePath.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiCurvePath.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiMeshVisual.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiMeshVisual.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiGridLayout.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiGridLayout.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiSegmentedTexture.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiSegmentedTexture.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDrawing.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiDrawing.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRealSize.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiRealSize.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextureManager.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTextureManager.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRealPoint.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiRealPoint.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiShadowedTexture.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiShadowedTexture.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huim3gmesh.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huim3gmesh.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRoster.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiRoster.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huifontspecification.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huifontspecification.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiShadowBorderBrush.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiShadowBorderBrush.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiInteractionInterval.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiInteractionInterval.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiImageVisual.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiImageVisual.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextMesh.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTextMesh.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiVisual.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiVisual.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiSessionObject.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiSessionObject.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTransformation.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTransformation.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTimedValue.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTimedValue.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTimeObserver.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiTimeObserver.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBrush.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiBrush.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiOwnedPointer.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiOwnedPointer.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiLayouts.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiLayouts.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRealRect.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiRealRect.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiScheduler.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiScheduler.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiEvent.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiEvent.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiControlGroup.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiControlGroup.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiObserverArray.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiObserverArray.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRenderer.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiRenderer.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiS60Skin.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiS60Skin.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiPlatform.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiPlatform.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huifontmanager.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huifontmanager.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huitk.rh) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huitk.rh) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiSkin.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiSkin.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiFlowLayout.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiFlowLayout.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiSoftKeyControl.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiSoftKeyControl.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCurvePathLayout.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiCurvePathLayout.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCommand.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiCommand.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiLineVisual.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiLineVisual.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBitmapProvider.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiBitmapProvider.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiThemeManager.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiThemeManager.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huidisplaybackgrounditem.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huidisplaybackgrounditem.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huitextureautosizeparams.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huitextureautosizeparams.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huidropshadow.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huidropshadow.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCanvasVisual.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiCanvasVisual.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCanvasCmdBufferReader.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiCanvasCmdBufferReader.h) -CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huilowmemoryobserver.h) MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/huilowmemoryobserver.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextureIf.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTextureIf.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiAnimatedTexture.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiAnimatedTexture.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiMappingFunctions.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiMappingFunctions.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTimedPoint.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTimedPoint.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBorderBrush.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiBorderBrush.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextureProcessor.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTextureProcessor.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiImageBrush.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiImageBrush.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiMaterial.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiMaterial.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDisplay.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiDisplay.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTexture.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTexture.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiImage.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiImage.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiGc.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiGc.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiPanic.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiPanic.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBrushArray.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiBrushArray.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huitk.hrh) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huitk.hrh) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiMesh.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiMesh.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huiframebrush.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huiframebrush.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huiproceduralmesh.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huiproceduralmesh.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiAnchorLayout.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiAnchorLayout.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiImageLoaderUtil.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiImageLoaderUtil.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huieventhandler.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huieventhandler.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huigifanimationtexture.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huigifanimationtexture.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huiskinanimationtexture.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huiskinanimationtexture.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiEnv.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiEnv.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDropShadowBrush.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiDropShadowBrush.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDisplayCoeControl.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiDisplayCoeControl.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiVisuals.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiVisuals.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiUtil.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiUtil.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huifixmath.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huifixmath.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextVisual.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTextVisual.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextStyleManager.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huitextstylemanager.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiControl.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiControl.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiLayout.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiLayout.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/hitchcock.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/hitchcock.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiFont.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiFont.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBrushes.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiBrushes.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextStyle.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huitextstyle.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huiviewportlayout.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huiviewportlayout.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huimetric.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huimetric.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextureHandle.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTextureHandle.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDeckLayout.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiDeckLayout.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiGradientBrush.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiGradientBrush.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiStatic.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiStatic.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCurvePath.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiCurvePath.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiMeshVisual.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiMeshVisual.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiGridLayout.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiGridLayout.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiSegmentedTexture.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiSegmentedTexture.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiDrawing.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiDrawing.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRealSize.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiRealSize.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextureManager.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTextureManager.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRealPoint.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiRealPoint.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiShadowedTexture.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiShadowedTexture.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huim3gmesh.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huim3gmesh.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRoster.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiRoster.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huifontspecification.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huifontspecification.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiShadowBorderBrush.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiShadowBorderBrush.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiInteractionInterval.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiInteractionInterval.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiImageVisual.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiImageVisual.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTextMesh.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTextMesh.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiVisual.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiVisual.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiSessionObject.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiSessionObject.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTransformation.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTransformation.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTimedValue.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTimedValue.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiTimeObserver.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiTimeObserver.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBrush.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiBrush.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiOwnedPointer.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiOwnedPointer.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiLayouts.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiLayouts.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRealRect.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiRealRect.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiScheduler.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiScheduler.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiEvent.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiEvent.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiControlGroup.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiControlGroup.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiObserverArray.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiObserverArray.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiRenderer.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiRenderer.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiS60Skin.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiS60Skin.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiPlatform.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiPlatform.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huifontmanager.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huifontmanager.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huitk.rh) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huitk.rh) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiSkin.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiSkin.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiFlowLayout.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiFlowLayout.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiSoftKeyControl.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiSoftKeyControl.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCurvePathLayout.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiCurvePathLayout.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCommand.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiCommand.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiLineVisual.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiLineVisual.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiBitmapProvider.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiBitmapProvider.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiThemeManager.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiThemeManager.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huidisplaybackgrounditem.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huidisplaybackgrounditem.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huitextureautosizeparams.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huitextureautosizeparams.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huidropshadow.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huidropshadow.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCanvasVisual.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiCanvasVisual.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/HuiCanvasCmdBufferReader.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiCanvasCmdBufferReader.h) +CORETOOLKIT_EXPORT_FOLDER(inc/uiacceltk/huilowmemoryobserver.h) INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/huilowmemoryobserver.h) diff -r 57d26d31c595 -r 5dafecb0892a uiaccelerator_plat/alf_extended_visual_api/group/bld.inf --- a/uiaccelerator_plat/alf_extended_visual_api/group/bld.inf Tue Sep 28 14:40:28 2010 +0300 +++ b/uiaccelerator_plat/alf_extended_visual_api/group/bld.inf Thu Oct 14 18:35:08 2010 +0300 @@ -18,16 +18,40 @@ +// The new Symbian Build System (SBS, Raptor) gives warnings from ## +// concatenation. Use __GNUC__ >= 3 to check the SBS version! +#ifndef __SERIES60_30__ #include +#if __GNUC__ >= 3 +#define CORETOOLKIT_EXPORT_FOLDER(P) ../P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S + +#else +#define CORETOOLKIT_EXPORT_FOLDER(P) ../##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#else +#if __GNUC__ >= 3 +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S +#else +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/##S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#endif PRJ_PLATFORMS DEFAULT PRJ_EXPORTS -../inc/alf/AlfTransEffectPlugin.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/AlfTransEffectPlugin.h) -../inc/alf/alflcttextvisual.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alflcttextvisual.h) -../inc/alf/alflctgridlayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alflctgridlayout.h) -../inc/alf/alfsrveffectenv.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfsrveffectenv.h) -../inc/alf/alflctanchorlayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alflctanchorlayout.h) -../inc/alf/AlfTransEffectPlugin.hrh MW_LAYER_PLATFORM_EXPORT_PATH(alf/AlfTransEffectPlugin.hrh) +../inc/alf/AlfTransEffectPlugin.h INTERNAL_UIACCEL_EXPORT_PATH(alf/AlfTransEffectPlugin.h) +../inc/alf/alflcttextvisual.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alflcttextvisual.h) +../inc/alf/alflctgridlayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alflctgridlayout.h) +../inc/alf/alfsrveffectenv.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfsrveffectenv.h) +../inc/alf/alflctanchorlayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alflctanchorlayout.h) +../inc/alf/AlfTransEffectPlugin.hrh INTERNAL_UIACCEL_EXPORT_PATH(alf/AlfTransEffectPlugin.hrh) diff -r 57d26d31c595 -r 5dafecb0892a uiaccelerator_plat/alf_extension_api/group/bld.inf --- a/uiaccelerator_plat/alf_extension_api/group/bld.inf Tue Sep 28 14:40:28 2010 +0300 +++ b/uiaccelerator_plat/alf_extension_api/group/bld.inf Thu Oct 14 18:35:08 2010 +0300 @@ -17,20 +17,43 @@ */ +// The new Symbian Build System (SBS, Raptor) gives warnings from ## +// concatenation. Use __GNUC__ >= 3 to check the SBS version! +#ifndef __SERIES60_30__ +#include +#if __GNUC__ >= 3 +#define CORETOOLKIT_EXPORT_FOLDER(P) ../P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S -#include +#else +#define CORETOOLKIT_EXPORT_FOLDER(P) ../##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#else +#if __GNUC__ >= 3 +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S +#else +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/##S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#endif PRJ_PLATFORMS DEFAULT PRJ_EXPORTS -../inc/alf/alfserverutils.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfserverutils.h) -../inc/alf/alfred.hrh MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfred.hrh) -../inc/alf/alfextensionfactory.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfextensionfactory.h) -../inc/alf/ftokenclient.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/ftokenclient.h) -../inc/alf/alflayouthandlers.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alflayouthandlers.h) -../inc/alf/alfvisualhandlers.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfvisualhandlers.h) -../inc/alf/alfconstants.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfconstants.h) -../inc/alf/alfbrushhandlers.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfbrushhandlers.h) -../inc/alf/alfhintplugin.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfhintplugin.h) \ No newline at end of file +../inc/alf/alfserverutils.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfserverutils.h) +../inc/alf/alfred.hrh INTERNAL_UIACCEL_EXPORT_PATH(alf/alfred.hrh) +../inc/alf/alfextensionfactory.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfextensionfactory.h) +../inc/alf/ftokenclient.h INTERNAL_UIACCEL_EXPORT_PATH(alf/ftokenclient.h) +../inc/alf/alflayouthandlers.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alflayouthandlers.h) +../inc/alf/alfvisualhandlers.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfvisualhandlers.h) +../inc/alf/alfconstants.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfconstants.h) +../inc/alf/alfbrushhandlers.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfbrushhandlers.h) +../inc/alf/alfhintplugin.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfhintplugin.h) \ No newline at end of file diff -r 57d26d31c595 -r 5dafecb0892a uiaccelerator_plat/alf_tracing_api/group/bld.inf --- a/uiaccelerator_plat/alf_tracing_api/group/bld.inf Tue Sep 28 14:40:28 2010 +0300 +++ b/uiaccelerator_plat/alf_tracing_api/group/bld.inf Thu Oct 14 18:35:08 2010 +0300 @@ -17,16 +17,39 @@ */ +// The new Symbian Build System (SBS, Raptor) gives warnings from ## +// concatenation. Use __GNUC__ >= 3 to check the SBS version! +#ifndef __SERIES60_30__ +#include +#if __GNUC__ >= 3 +#define CORETOOLKIT_EXPORT_FOLDER(P) ../P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S -#include +#else +#define CORETOOLKIT_EXPORT_FOLDER(P) ../##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#else +#if __GNUC__ >= 3 +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S +#else +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/##S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#endif PRJ_PLATFORMS DEFAULT PRJ_EXPORTS -../inc/uiacceltk/HuiProbe.h MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiProbe.h) -../inc/alf/alfmetricsinterface.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfmetricsinterface.h) -../inc/alf/alflayoutmetrics.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alflayoutmetrics.h) -../inc/alf/alftraceextclient.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftraceextclient.h) -../inc/alf/alftraceinterface.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftraceinterface.h) +../inc/uiacceltk/HuiProbe.h INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiProbe.h) +../inc/alf/alfmetricsinterface.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfmetricsinterface.h) +../inc/alf/alflayoutmetrics.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alflayoutmetrics.h) +../inc/alf/alftraceextclient.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftraceextclient.h) +../inc/alf/alftraceinterface.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftraceinterface.h) diff -r 57d26d31c595 -r 5dafecb0892a uiaccelerator_plat/alf_visual_api/group/bld.inf --- a/uiaccelerator_plat/alf_visual_api/group/bld.inf Tue Sep 28 14:40:28 2010 +0300 +++ b/uiaccelerator_plat/alf_visual_api/group/bld.inf Thu Oct 14 18:35:08 2010 +0300 @@ -18,88 +18,112 @@ +// The new Symbian Build System (SBS, Raptor) gives warnings from ## +// concatenation. Use __GNUC__ >= 3 to check the SBS version! +#ifndef __SERIES60_30__ #include +#if __GNUC__ >= 3 +#define CORETOOLKIT_EXPORT_FOLDER(P) ../P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S + +#else +#define CORETOOLKIT_EXPORT_FOLDER(P) ../##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#else +#if __GNUC__ >= 3 +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S +#else +#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/##S +#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/##P +#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S + +#endif +#endif PRJ_PLATFORMS DEFAULT PRJ_EXPORTS -../inc/alf/alftextstylemanager.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftextstylemanager.h) -../inc/alf/alftextvisual.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftextvisual.h) -../inc/alf/alfgencomponent.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfgencomponent.h) -../inc/alf/alfcurvepathlayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfcurvepathlayout.h) -../inc/alf/alfcontrol.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfcontrol.h) -../inc/alf/alfviewportlayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfviewportlayout.h) -../inc/alf/alfdecklayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfdecklayout.h) -../inc/alf/alfimage.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfimage.h) -../inc/alf/alfownership.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfownership.h) -../inc/alf/alfimageloaderutil.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfimageloaderutil.h) -../inc/alf/alfenv.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfenv.h) -../inc/alf/alfmeshvisual.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfmeshvisual.h) -../inc/alf/alfvisualfactory.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfvisualfactory.h) -../inc/alf/alfgridlayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfgridlayout.h) -../inc/alf/alfcurvepath.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfcurvepath.h) -../inc/alf/alftimedvalue.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftimedvalue.h) -../inc/alf/alfgradientbrush.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfgradientbrush.h) -../inc/alf/alftextstyle.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftextstyle.h) -../inc/alf/alfmetric.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfmetric.h) -../inc/alf/alfbitmapprovider.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfbitmapprovider.h) -../inc/alf/alfimagevisual.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfimagevisual.h) -../inc/alf/alfanchorlayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfanchorlayout.h) -../inc/alf/alfdropshadowbrush.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfdropshadowbrush.h) -../inc/alf/alfmesh.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfmesh.h) -../inc/alf/alfframebrush.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfframebrush.h) -../inc/alf/alfeventhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfeventhandler.h) -../inc/alf/alfflowlayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfflowlayout.h) -../inc/alf/alfimagebrush.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfimagebrush.h) -../inc/alf/alfinputcapabilitiessupplier.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfinputcapabilitiessupplier.h) -../inc/alf/alflayout.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alflayout.h) -../inc/alf/alfborderbrush.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfborderbrush.h) -../inc/alf/alfutil.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfutil.h) -../inc/alf/alflinevisual.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alflinevisual.h) -../inc/alf/alfproperty.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfproperty.h) -../inc/alf/alfbrusharray.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfbrusharray.h) -../inc/alf/alfstatic.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfstatic.h) -../inc/alf/alfcommand.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfcommand.h) -../inc/alf/alfmaterial.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfmaterial.h) -../inc/alf/alfm3gmesh.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfm3gmesh.h) -../inc/alf/alfpropertyowner.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfpropertyowner.h) -../inc/alf/alftexturemanager.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftexturemanager.h) -../inc/alf/alfcontrolgroup.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfcontrolgroup.h) -../inc/alf/alftransformation.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftransformation.h) -../inc/alf/alfbrush.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfbrush.h) -../inc/alf/alfdisplay.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfdisplay.h) -../inc/alf/alftexture.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftexture.h) -../inc/alf/alfroster.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfroster.h) -../inc/alf/alfevent.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfevent.h) -../inc/alf/alfgc.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfgc.h) -../inc/alf/alfproceduralmesh.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfproceduralmesh.h) -../inc/alf/alfmappingfunctions.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfmappingfunctions.h) -../inc/alf/alfvisual.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfvisual.h) -../inc/alf/alftextureprocessor.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftextureprocessor.h) -../inc/alf/alfshadowborderbrush.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfshadowborderbrush.h) -../inc/alf/alfscrollerevent.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfscrollerevent.h) -../inc/alf/alfversion.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfversion.h) -../inc/alf/alfscreenbuffer.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfscreenbuffer.h) -../inc/alf/alfsymbiansbdrawer.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfsymbiansbdrawer.h) -../inc/alf/alfdisplaybackgrounditem.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfdisplaybackgrounditem.h) -../inc/alf/alfbatchbuffer.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfbatchbuffer.h) -../inc/alf/alfenvobject.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfenvobject.h) -../inc/alf/alftextureautosizeparams.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftextureautosizeparams.h) -../inc/alf/alfdropshadow.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfdropshadow.h) -../inc/alf/alftexturegroup.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftexturegroup.h) -../inc/alf/alfcanvasvisual.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfcanvasvisual.h) -../inc/alf/alfrealline.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfrealline.h) -../inc/alf/alfclientwindow.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfclientwindow.h) +../inc/alf/alftextstylemanager.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftextstylemanager.h) +../inc/alf/alftextvisual.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftextvisual.h) +../inc/alf/alfgencomponent.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfgencomponent.h) +../inc/alf/alfcurvepathlayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfcurvepathlayout.h) +../inc/alf/alfcontrol.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfcontrol.h) +../inc/alf/alfviewportlayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfviewportlayout.h) +../inc/alf/alfdecklayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfdecklayout.h) +../inc/alf/alfimage.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfimage.h) +../inc/alf/alfownership.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfownership.h) +../inc/alf/alfimageloaderutil.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfimageloaderutil.h) +../inc/alf/alfenv.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfenv.h) +../inc/alf/alfmeshvisual.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfmeshvisual.h) +../inc/alf/alfvisualfactory.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfvisualfactory.h) +../inc/alf/alfgridlayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfgridlayout.h) +../inc/alf/alfcurvepath.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfcurvepath.h) +../inc/alf/alftimedvalue.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftimedvalue.h) +../inc/alf/alfgradientbrush.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfgradientbrush.h) +../inc/alf/alftextstyle.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftextstyle.h) +../inc/alf/alfmetric.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfmetric.h) +../inc/alf/alfbitmapprovider.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfbitmapprovider.h) +../inc/alf/alfimagevisual.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfimagevisual.h) +../inc/alf/alfanchorlayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfanchorlayout.h) +../inc/alf/alfdropshadowbrush.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfdropshadowbrush.h) +../inc/alf/alfmesh.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfmesh.h) +../inc/alf/alfframebrush.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfframebrush.h) +../inc/alf/alfeventhandler.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfeventhandler.h) +../inc/alf/alfflowlayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfflowlayout.h) +../inc/alf/alfimagebrush.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfimagebrush.h) +../inc/alf/alfinputcapabilitiessupplier.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfinputcapabilitiessupplier.h) +../inc/alf/alflayout.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alflayout.h) +../inc/alf/alfborderbrush.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfborderbrush.h) +../inc/alf/alfutil.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfutil.h) +../inc/alf/alflinevisual.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alflinevisual.h) +../inc/alf/alfproperty.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfproperty.h) +../inc/alf/alfbrusharray.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfbrusharray.h) +../inc/alf/alfstatic.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfstatic.h) +../inc/alf/alfcommand.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfcommand.h) +../inc/alf/alfmaterial.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfmaterial.h) +../inc/alf/alfm3gmesh.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfm3gmesh.h) +../inc/alf/alfpropertyowner.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfpropertyowner.h) +../inc/alf/alftexturemanager.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftexturemanager.h) +../inc/alf/alfcontrolgroup.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfcontrolgroup.h) +../inc/alf/alftransformation.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftransformation.h) +../inc/alf/alfbrush.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfbrush.h) +../inc/alf/alfdisplay.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfdisplay.h) +../inc/alf/alftexture.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftexture.h) +../inc/alf/alfroster.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfroster.h) +../inc/alf/alfevent.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfevent.h) +../inc/alf/alfgc.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfgc.h) +../inc/alf/alfproceduralmesh.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfproceduralmesh.h) +../inc/alf/alfmappingfunctions.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfmappingfunctions.h) +../inc/alf/alfvisual.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfvisual.h) +../inc/alf/alftextureprocessor.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftextureprocessor.h) +../inc/alf/alfshadowborderbrush.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfshadowborderbrush.h) +../inc/alf/alfscrollerevent.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfscrollerevent.h) +../inc/alf/alfversion.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfversion.h) +../inc/alf/alfscreenbuffer.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfscreenbuffer.h) +../inc/alf/alfsymbiansbdrawer.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfsymbiansbdrawer.h) +../inc/alf/alfdisplaybackgrounditem.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfdisplaybackgrounditem.h) +../inc/alf/alfbatchbuffer.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfbatchbuffer.h) +../inc/alf/alfenvobject.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfenvobject.h) +../inc/alf/alftextureautosizeparams.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftextureautosizeparams.h) +../inc/alf/alfdropshadow.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfdropshadow.h) +../inc/alf/alftexturegroup.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alftexturegroup.h) +../inc/alf/alfcanvasvisual.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfcanvasvisual.h) +../inc/alf/alfrealline.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfrealline.h) +../inc/alf/alfclientwindow.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfclientwindow.h) -// for now +// Goom for now. To be subsituted. ../inc/goommonitor/goommonitor.h MW_LAYER_PLATFORM_EXPORT_PATH(goommonitor.h) ../inc/goommonitor/goommonitorsession.h MW_LAYER_PLATFORM_EXPORT_PATH(goommonitorsession.h) ../inc/goommonitor/goommonitorplugin.h MW_LAYER_PLATFORM_EXPORT_PATH(goommonitorplugin.h) ../inc/goommonitor/goommonitorplugin.hrh MW_LAYER_PLATFORM_EXPORT_PATH(goommonitorplugin.hrh) -../inc/alf/alfcompositionclient.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfcompositionclient.h) -../inc/alf/alfcompositionutility.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfcompositionutility.h) +../inc/alf/alfcompositionclient.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfcompositionclient.h) +../inc/alf/alfcompositionutility.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfcompositionutility.h) -../inc/alf/alfdrawer.h MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfdrawer.h) +../inc/alf/alfdrawer.h INTERNAL_UIACCEL_EXPORT_PATH(alf/alfdrawer.h) diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/AlfCommandDebug/group/alfcommanddebug.mmp --- a/uiacceltk/hitchcock/AlfCommandDebug/group/alfcommanddebug.mmp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/AlfCommandDebug/group/alfcommanddebug.mmp Thu Oct 14 18:35:08 2010 +0300 @@ -28,6 +28,7 @@ SYSTEMINCLUDE /epoc32/include SYSTEMINCLUDE ../../CommonInc +SYSTEMINCLUDE ../../../../inc MW_LAYER_SYSTEMINCLUDE diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/AlfHintPlugin/group/AlfHintPlugin.mmp --- a/uiacceltk/hitchcock/AlfHintPlugin/group/AlfHintPlugin.mmp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/AlfHintPlugin/group/AlfHintPlugin.mmp Thu Oct 14 18:35:08 2010 +0300 @@ -33,6 +33,8 @@ SYSTEMINCLUDE /epoc32/include USERINCLUDE ../inc SYSTEMINCLUDE ../../CommonInc +SYSTEMINCLUDE ../../../../inc + MW_LAYER_SYSTEMINCLUDE diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/AlfHintPlugin/src/alfhintplugindrawer.cpp --- a/uiacceltk/hitchcock/AlfHintPlugin/src/alfhintplugindrawer.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/AlfHintPlugin/src/alfhintplugindrawer.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -66,7 +66,7 @@ // --------------------------------------------------------------------------- // void CAlfHintGraphicDrawer::ConstructL(MWsGraphicDrawerEnvironment& aEnv, const TGraphicDrawerId& aId, - MWsClient& aOwner, const TDesC8& aData) + MWsClient& aOwner, const TDesC8& /*aData*/) { iEnv = &aEnv; BaseConstructL(aEnv, aId, aOwner); @@ -94,7 +94,7 @@ // DoDraw // --------------------------------------------------------------------------- // -void CAlfHintGraphicDrawer::DoDraw(MWsGc& aGc, const TRect& aRect, const TDesC8& aData) const +void CAlfHintGraphicDrawer::DoDraw(MWsGc& /*aGc*/, const TRect& /*aRect*/, const TDesC8& aData) const { // read data TInt err = 0; @@ -127,7 +127,7 @@ // HandleMessage // --------------------------------------------------------------------------- // -void CAlfHintGraphicDrawer::HandleMessage(const TDesC8& aData) +void CAlfHintGraphicDrawer::HandleMessage(const TDesC8& /*aData*/) { } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/AlfRenderStage/group/alfrenderstageplugin.mmp --- a/uiacceltk/hitchcock/AlfRenderStage/group/alfrenderstageplugin.mmp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/AlfRenderStage/group/alfrenderstageplugin.mmp Thu Oct 14 18:35:08 2010 +0300 @@ -66,6 +66,7 @@ SYSTEMINCLUDE /epoc32/include SYSTEMINCLUDE ../../CommonInc SYSTEMINCLUDE ../../ServerCore/Inc // todo.. +SYSTEMINCLUDE ../../../../inc MW_LAYER_SYSTEMINCLUDE diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/AlfRenderStage/src/alfrenderstage.cpp --- a/uiacceltk/hitchcock/AlfRenderStage/src/alfrenderstage.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/AlfRenderStage/src/alfrenderstage.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -1095,7 +1095,11 @@ } } +#ifdef RD_SUBWINDOW_EFFECTS void CAlfRenderStage::InsertTagL( TInt aTag, TRect aBoundingRectangle, TInt aLayerId ) +#else +void CAlfRenderStage::InsertTagL( TInt aTag, TRect /*aBoundingRectangle*/, TInt /*aLayerId*/ ) +#endif { switch(aTag) { diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/AlfRenderStage/src/alfrssendbuffer.cpp --- a/uiacceltk/hitchcock/AlfRenderStage/src/alfrssendbuffer.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/AlfRenderStage/src/alfrssendbuffer.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -1090,7 +1090,11 @@ // WriteFollowingFrameOffsetL // --------------------------------------------------------------------------- // +#ifdef RD_SUBWINDOW_EFFECTS TBool CAlfRsSendBuffer::WriteFollowingFrameOffsetL(TBool aSendArray) +#else +TBool CAlfRsSendBuffer::WriteFollowingFrameOffsetL(TBool /*aSendArray*/) +#endif { if (iDisabled) // return if this send buffer is not in use { diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/Client/src/alfdirectclient.cpp --- a/uiacceltk/hitchcock/Client/src/alfdirectclient.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/Client/src/alfdirectclient.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -42,7 +42,7 @@ Send( command, TIpcArgs(aId)); } -EXPORT_C void RAlfDirectClient::EnableLowMemoryState( TBool aMode , TBool aUseSwRendering) +EXPORT_C void RAlfDirectClient::EnableLowMemoryState( TBool aMode , TBool /*aUseSwRendering*/) { if (!Handle()) { diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/Client/src/alftextstyle.cpp --- a/uiacceltk/hitchcock/Client/src/alftextstyle.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/Client/src/alftextstyle.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -1063,7 +1063,7 @@ // ConstructL // --------------------------------------------------------------------------- // -void CAlfTextStyle::ConstructL(CAlfEnv& aEnv, TInt aId, TInt aImplementationId, const TDesC8& /*aConstructionParams*/) +void CAlfTextStyle::ConstructL(CAlfEnv& /*aEnv*/, TInt aId, TInt aImplementationId, const TDesC8& /*aConstructionParams*/) { if(!iData) { diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/Client/src/alftextstylemanager.cpp --- a/uiacceltk/hitchcock/Client/src/alftextstylemanager.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/Client/src/alftextstylemanager.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -569,7 +569,11 @@ // Internal implementation to create a platform style. // --------------------------------------------------------------------------- // +#ifdef ALF_RASTER_TEXT +TInt CAlfTextStyleManager::DoCreatePlatformTextStyleL(TInt aFontStyleId, TInt aParentId, TInt /*aImplementationId*/) +#else TInt CAlfTextStyleManager::DoCreatePlatformTextStyleL(TInt aFontStyleId, TInt aParentId, TInt aImplementationId) +#endif { #ifdef ALF_RASTER_TEXT // Create construction parameters for alf text style object. diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/ServerCore/Src/alfappsrvsession.cpp --- a/uiacceltk/hitchcock/ServerCore/Src/alfappsrvsession.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/ServerCore/Src/alfappsrvsession.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -243,7 +243,7 @@ // Called when client receives focus. // --------------------------------------------------------------------------- // -void CAlfAppSrvSession::FocusGainedL( TBool aDoTransitionEffect ) +void CAlfAppSrvSession::FocusGainedL( TBool /*aDoTransitionEffect*/ ) { iFocused = ETrue; DeliverTextureInfo(); @@ -310,7 +310,7 @@ // Called when client loses focus. // --------------------------------------------------------------------------- // -TBool CAlfAppSrvSession::FocusLostL( TBool aDoTransitionEffect ) +TBool CAlfAppSrvSession::FocusLostL( TBool /*aDoTransitionEffect*/ ) { iFocused = EFalse; diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/ServerCore/Src/alfappui.cpp --- a/uiacceltk/hitchcock/ServerCore/Src/alfappui.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/ServerCore/Src/alfappui.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -972,7 +972,7 @@ // Handles window server event. // --------------------------------------------------------------------------- // -EXPORT_C void CAlfAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl* aDestination) +EXPORT_C void CAlfAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl* /*aDestination*/) { if (aEvent.Type() >= EEventPointer && aEvent.Type() <= EEventDragDrop ) { @@ -1253,7 +1253,7 @@ } -TTypeUid::Ptr CAlfAppUi::MopSupplyObject(TTypeUid aId) +TTypeUid::Ptr CAlfAppUi::MopSupplyObject(TTypeUid /*aId*/) { return TTypeUid::Null(); } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp --- a/uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -2247,7 +2247,12 @@ // // --------------------------------------------------------------------------- // + +#ifdef _ALF_LOGGING void CAlfNode::Debug_CheckSiblingOrder(const TDesC16& aContext) +#else +void CAlfNode::Debug_CheckSiblingOrder(const TDesC16& /*aContext*/) +#endif { if (!iParent || Type() != MWsWindowTreeNode::EWinTreeNodeClient) { diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/ServerCore/Src/alfwindowmanager.cpp --- a/uiacceltk/hitchcock/ServerCore/Src/alfwindowmanager.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/ServerCore/Src/alfwindowmanager.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -316,7 +316,7 @@ // Decaprecated // --------------------------------------------------------------------------- // -EXPORT_C CAlfWindow* CAlfWindowManager::ReserveL( const TWindowIdentifier& /*aId*/, TBool aReserveBuffer /*= ETrue*/ ) +EXPORT_C CAlfWindow* CAlfWindowManager::ReserveL( const TWindowIdentifier& /*aId*/, TBool /*aReserveBuffer */ ) { return 0; // we never get here } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/backgroundanim/refplugin/src/plugin.c --- a/uiacceltk/hitchcock/backgroundanim/refplugin/src/plugin.c Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/backgroundanim/refplugin/src/plugin.c Thu Oct 14 18:35:08 2010 +0300 @@ -164,6 +164,7 @@ int initialize(const char* path, unsigned int maxgpumemusage) { + maxgpumemusage=maxgpumemusage; // not used, just to remove compiler warning plugindir = strdup(path); return 0; } @@ -175,6 +176,7 @@ int extension(int value, void* ptr) { + value=value; ptr=ptr; // not used, just to remove compiler warning return 0; } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/backgroundanim/src/bganimhost.cpp --- a/uiacceltk/hitchcock/backgroundanim/src/bganimhost.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/backgroundanim/src/bganimhost.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -756,11 +756,11 @@ } } -void CBgAnimHost::DataError( CSensrvChannel& aChannel, TSensrvErrorSeverity aError ) +void CBgAnimHost::DataError( CSensrvChannel& /*aChannel*/, TSensrvErrorSeverity /*aError*/ ) { } -void CBgAnimHost::GetDataListenerInterfaceL( TUid aInterfaceUid, TAny*& aInterface) +void CBgAnimHost::GetDataListenerInterfaceL( TUid /*aInterfaceUid*/, TAny*& /*aInterface*/) { } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/eabi/hitchcocku.DEF --- a/uiacceltk/hitchcock/coretoolkit/eabi/hitchcocku.DEF Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/eabi/hitchcocku.DEF Thu Oct 14 18:35:08 2010 +0300 @@ -2004,4 +2004,34 @@ _ZN13CAppIconCache6InsertER17TRasterizedBitmap @ 2003 NONAME _ZNK7CHuiEnv12AppIconCacheEv @ 2004 NONAME _ZN11CHuiDisplay24SetSkinSizeChangePendingEv @ 2005 NONAME + _ZN11THuiCommandC2E15THuiCommandType @ 2006 NONAME + _ZN14CHuiTextVisual12PrepareDrawLEv @ 2007 NONAME + _ZN16CHuiThemeManager10ConstructLEv @ 2008 NONAME + _ZN17CHuiFxEffectCache4NewLEv @ 2009 NONAME + _ZN17CHuiFxEffectCache5UnUseEP21MHuiFxEffectCacheNode @ 2010 NONAME + _ZN17CHuiFxEffectCacheD0Ev @ 2011 NONAME + _ZN17CHuiFxEffectCacheD1Ev @ 2012 NONAME + _ZN17CHuiFxEffectCacheD2Ev @ 2013 NONAME + _ZN17CHuiFxFilterLayer4NewLEP12CHuiFxFilter @ 2014 NONAME + _ZN17CHuiFxFilterLayerD0Ev @ 2015 NONAME + _ZN17CHuiFxFilterLayerD1Ev @ 2016 NONAME + _ZN17CHuiFxFilterLayerD2Ev @ 2017 NONAME + _ZN17THuiObjectCommandC1E15THuiCommandTypePv6THuiOp @ 2018 NONAME + _ZN17THuiObjectCommandC2E15THuiCommandTypePv6THuiOp @ 2019 NONAME + _ZN18CHuiSoftKeyControlD0Ev @ 2020 NONAME + _ZN18CHuiSoftKeyControlD1Ev @ 2021 NONAME + _ZN18CHuiSoftKeyControlD2Ev @ 2022 NONAME + _ZN27CHuiFxEffectCacheEffectNodeD0Ev @ 2023 NONAME + _ZN27CHuiFxEffectCacheEffectNodeD1Ev @ 2024 NONAME + _ZN27CHuiFxEffectCacheEffectNodeD2Ev @ 2025 NONAME + _ZN9THuiImage12ClearChangedEv @ 2026 NONAME + _ZNK10CHuiVisual7FreezedEv @ 2027 NONAME + _ZNK9THuiImage7ChangedEv @ 2028 NONAME + _ZThn4_N18CHuiSoftKeyControlD0Ev @ 2029 NONAME + _ZThn4_N18CHuiSoftKeyControlD1Ev @ 2030 NONAME + _ZThn4_N18CHuiTextureManager13CTextureEntryD0Ev @ 2031 NONAME + _ZThn4_N27CHuiFxEffectCacheEffectNodeD0Ev @ 2032 NONAME + _ZThn4_N27CHuiFxEffectCacheEffectNodeD1Ev @ 2033 NONAME + _ZThn8_N18CHuiSoftKeyControlD0Ev @ 2034 NONAME + _ZThn8_N18CHuiSoftKeyControlD1Ev @ 2035 NONAME diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/inc/huicanvasalfpainter.h --- a/uiacceltk/hitchcock/coretoolkit/inc/huicanvasalfpainter.h Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/inc/huicanvasalfpainter.h Thu Oct 14 18:35:08 2010 +0300 @@ -225,7 +225,7 @@ * Handles the command buffer(s), either draws or performs a scan. */ virtual void HandleBufferL(TRect& aDisplayRect, TInt aAction, const CHuiCanvasVisual& aUser, CHuiGc* aGc, TPoint aPos ) ; - virtual void HandleBufferL(TRect& aDisplayRect, TInt aAction, const CHuiCanvasVisual& aUser, CHuiGc* aGc, TPoint aPos, TPtrC8 aCommands, CHuiCanvasCommandBuffer *buf) { } + virtual void HandleBufferL(TRect& /*aDisplayRect*/, TInt /*aAction*/, const CHuiCanvasVisual& /*aUser*/, CHuiGc* /*aGc*/, TPoint /*aPos*/, TPtrC8 /*aCommands*/, CHuiCanvasCommandBuffer* /*buf*/) { } /** * Returns the number of rectangular areas which contain something that is diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/rendervg10/group/huirendervg10.mmp --- a/uiacceltk/hitchcock/coretoolkit/rendervg10/group/huirendervg10.mmp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/rendervg10/group/huirendervg10.mmp Thu Oct 14 18:35:08 2010 +0300 @@ -45,11 +45,11 @@ MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE ../../inc SYSTEMINCLUDE /epoc32/include/ecom +SYSTEMINCLUDE ../../../../../inc USERINCLUDE ../../inc USERINCLUDE ../inc USERINCLUDE ../../../CommonInc - //Added as part of break team support changes. #include "../../../../../group/stdinc.mmh" diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/rendervg10/src/HuiFxVg10OffscreenRenderbuffer.cpp --- a/uiacceltk/hitchcock/coretoolkit/rendervg10/src/HuiFxVg10OffscreenRenderbuffer.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/rendervg10/src/HuiFxVg10OffscreenRenderbuffer.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -162,7 +162,7 @@ return *iGc; } -void CHuiFxVg10OffscreenRenderbuffer::BindAsTexture(THuiFxRenderbufferUsage aUsage) +void CHuiFxVg10OffscreenRenderbuffer::BindAsTexture(THuiFxRenderbufferUsage /*aUsage*/) { // Nothing to do } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/rendervg10/src/HuiVg10Gc.cpp --- a/uiacceltk/hitchcock/coretoolkit/rendervg10/src/HuiVg10Gc.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/rendervg10/src/HuiVg10Gc.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -1268,7 +1268,6 @@ UpdateColor(); - THuiRealPoint aTopLeft(aRect.iTl); THuiRealSize aSize(aRect.iBr.iX - aRect.iTl.iX, aRect.iBr.iY - aRect.iTl.iY); THuiRealRect sourceRect(GetSourceRectangleFromImage(aImage)); THuiRealSize imageSize = aImage.Texture().Size(); diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiCanvasTextureCache.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiCanvasTextureCache.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiCanvasTextureCache.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -3424,7 +3424,7 @@ return NULL; } -void CHuiCanvasTextureCache::EnableLowMemoryState(TBool aEnable) +void CHuiCanvasTextureCache::EnableLowMemoryState(TBool /*aEnable*/) { // deprecated } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiCanvasVisual.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiCanvasVisual.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiCanvasVisual.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -1535,7 +1535,7 @@ } } -TBool CHuiCanvasVisual::CollectPaintedRegion(TRegion& aPaintRegion, TInt aExcludeCanvasFlags) const +TBool CHuiCanvasVisual::CollectPaintedRegion(TRegion& aPaintRegion, TInt /*aExcludeCanvasFlags*/) const { // Only our own painted areas. TInt paintedAreaCount = PaintedAreaCount(); diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiCmdBufferBrush.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiCmdBufferBrush.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiCmdBufferBrush.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -81,7 +81,7 @@ { TRect rect = iBuffers[i].iBoundingRectangle; - RDebug::Print(_L("TP: ClearBackground %d"), iLayerId); + //RDebug::Print(_L("TP: ClearBackground %d"), iLayerId); ClearBackground(aGc, rect); rect.iTl.iX += brushRect.iTl.iX; @@ -152,7 +152,7 @@ } -void CHuiCmdBufferBrush::ClearBackground(CHuiGc &aGc, TRect aRectangle) const +void CHuiCmdBufferBrush::ClearBackground(CHuiGc & /*aGc*/, TRect aRectangle) const { //void DrawRects(RArray& aRects); #if 0 @@ -173,10 +173,10 @@ } } void CHuiCmdBufferBrush::DrawDrawingCommands(TInt aAction, CHuiGc &aGc, TRect aClippingRectangle, - TPtrC8 aCommands, CHuiCanvasCommandBuffer *buf, const TRegion ®) const + TPtrC8 aCommands, CHuiCanvasCommandBuffer *buf, const TRegion & /*reg*/) const { TRect rect = aClippingRectangle; - RDebug::Print(_L("TP: DrawDrawingCommands (%d,%d)-(%d,%d)"), rect.iTl.iX, rect.iTl.iY, rect.iBr.iX, rect.iBr.iY); + //RDebug::Print(_L("TP: DrawDrawingCommands (%d,%d)-(%d,%d)"), rect.iTl.iX, rect.iTl.iY, rect.iBr.iX, rect.iBr.iY); //iCanvasWsGc.EnableUpdateRegion(reg /*buf->iUpdateRegion*/, EFalse /*aClearBeforeHandlingBuffers*/); @@ -184,9 +184,9 @@ //iCanvasWsGc.DisableUpdateRegion(); } -void CHuiCmdBufferBrush::CopyBuffer(CHuiGc &aGc, TRect aRectangle) const +void CHuiCmdBufferBrush::CopyBuffer(CHuiGc & /*aGc*/, TRect /*aRectangle*/) const { - RDebug::Print(_L("TP: CopyBuffer")); + //RDebug::Print(_L("TP: CopyBuffer")); } void CHuiCmdBufferBrush::Flush() const @@ -208,7 +208,7 @@ { return 1.0; } -void CHuiCmdBufferBrush::EffectSetOpacity(TReal32 aOpacity) +void CHuiCmdBufferBrush::EffectSetOpacity(TReal32 /*aOpacity*/) { // empty } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiCommand.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiCommand.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiCommand.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -30,7 +30,7 @@ #include "uiacceltk/HuiUtil.h" -THuiCommand::THuiCommand(THuiCommandType aType) +EXPORT_C THuiCommand::THuiCommand(THuiCommandType aType) : iType(aType), iSenderType(EHuiCommandObjectTypeNone), iSender(NULL) { } @@ -140,7 +140,7 @@ } -THuiObjectCommand::THuiObjectCommand(THuiCommandType aType, TAny* aDataOwnerObject, THuiOp aOperation) +EXPORT_C THuiObjectCommand::THuiObjectCommand(THuiCommandType aType, TAny* aDataOwnerObject, THuiOp aOperation) : THuiCommand(aType), iObject(aDataOwnerObject), iOperation(aOperation) { } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiFxEffectCache.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiFxEffectCache.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiFxEffectCache.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -22,12 +22,12 @@ #include "uiacceltk/HuiPanic.h" #include "HuiFxConstants.h" -CHuiFxEffectCache *CHuiFxEffectCache::NewL() +EXPORT_C CHuiFxEffectCache *CHuiFxEffectCache::NewL() { return new (ELeave)CHuiFxEffectCache; } -CHuiFxEffectCache::~CHuiFxEffectCache() +EXPORT_C CHuiFxEffectCache::~CHuiFxEffectCache() { iCachedEffects.ResetAndDestroy(); #if 0 @@ -117,7 +117,7 @@ } } -void CHuiFxEffectCache::UnUse(MHuiFxEffectCacheNode *aNode) +EXPORT_C void CHuiFxEffectCache::UnUse(MHuiFxEffectCacheNode *aNode) { // unregisteration of fxml file MHuiFxEffectCacheNode *cachedNode = Find(aNode); if (cachedNode) @@ -319,7 +319,7 @@ } -CHuiFxEffectCacheEffectNode::~CHuiFxEffectCacheEffectNode() +EXPORT_C CHuiFxEffectCacheEffectNode::~CHuiFxEffectCacheEffectNode() { delete iFileName; delete iParser; diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiFxFilterLayer.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiFxFilterLayer.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiFxFilterLayer.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -20,7 +20,7 @@ #include "HuiFxFilterLayer.h" #include "HuiFxFilter.h" -CHuiFxFilterLayer* CHuiFxFilterLayer::NewL(CHuiFxFilter* aFilter) +EXPORT_C CHuiFxFilterLayer* CHuiFxFilterLayer::NewL(CHuiFxFilter* aFilter) { CHuiFxFilterLayer* e = new (ELeave) CHuiFxFilterLayer(); CleanupStack::PushL(e); @@ -36,7 +36,7 @@ #endif } -CHuiFxFilterLayer::~CHuiFxFilterLayer() +EXPORT_C CHuiFxFilterLayer::~CHuiFxFilterLayer() { delete iFilter; iFilter = NULL; diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiFxParameter.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiFxParameter.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiFxParameter.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -42,11 +42,11 @@ { *aValue2 = aValue; } -void ReRefInternal(TReal32 *aValue, TRgb **aValue2) +void ReRefInternal(TReal32 * /*aValue*/, TRgb ** /*aValue2*/) { // empty because assignment from TReal to TRgb fails } -void ReRefInternal(TRgb *aValue, TReal32 **aValue2) +void ReRefInternal(TRgb * /*aValue*/, TReal32 ** /*aValue2*/) { // empty because assignment from TRgb to TReal32 fails } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiImage.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiImage.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiImage.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -427,7 +427,7 @@ } -TBool THuiImage::Changed() const +EXPORT_C TBool THuiImage::Changed() const { if(iTexture && iTexture->TextureChanged()) { @@ -438,7 +438,7 @@ } -void THuiImage::ClearChanged() +EXPORT_C void THuiImage::ClearChanged() { if(iTexture) { diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiRosterImpl.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiRosterImpl.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiRosterImpl.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -1841,7 +1841,7 @@ iEffectOpacity = aOpacity; } -void CHuiRosterImpl::EffectDrawSelf( CHuiGc &aGc, const TRect & aDisplayRect) const +void CHuiRosterImpl::EffectDrawSelf( CHuiGc &aGc, const TRect & /*aDisplayRect*/) const { DrawSelf(aGc, iDisplay); } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiS60Skin.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiS60Skin.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiS60Skin.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -201,7 +201,7 @@ } EXPORT_C void CHuiS60Skin::SkinPackageChanged( - const TAknsSkinStatusPackageChangeReason aReason ) + const TAknsSkinStatusPackageChangeReason /*aReason*/ ) { } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiSoftKeyControl.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiSoftKeyControl.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiSoftKeyControl.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -88,7 +88,7 @@ } -CHuiSoftKeyControl::~CHuiSoftKeyControl() +EXPORT_C CHuiSoftKeyControl::~CHuiSoftKeyControl() { delete iLeftText; delete iRightText; diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiTextVisual.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiTextVisual.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiTextVisual.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -359,7 +359,7 @@ (color & 0xff000000); } //#endif - return aColor; +// return aColor; } @@ -388,7 +388,7 @@ } -TBool CHuiTextVisual::PrepareDrawL() +EXPORT_C TBool CHuiTextVisual::PrepareDrawL() { if (Flags() & EHuiVisualFlagDrawOnlyAsExternalContent) { diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiThemeManager.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiThemeManager.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiThemeManager.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -68,7 +68,7 @@ // Two phase constructor // --------------------------------------------------------------------------- // -void CHuiThemeManager::ConstructL() +EXPORT_C void CHuiThemeManager::ConstructL() { iThemeManager = NULL; } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/HuiVisual.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiVisual.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiVisual.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -179,7 +179,7 @@ { iVisualData->iFreezed = aEnabled; } -TBool CHuiVisual::Freezed() const +EXPORT_C TBool CHuiVisual::Freezed() const { return iVisualData->iFreezed; } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -916,7 +916,7 @@ // Implementation is renderspecific } -EXPORT_C void CHuiCanvasGc::EnableBlendingIfNeeded(const CHuiTexture* aTexture) +EXPORT_C void CHuiCanvasGc::EnableBlendingIfNeeded(const CHuiTexture* /*aTexture*/) { if (iDrawMode == EHuiCanvasDrawModeBlend) { diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/huicanvaswsbitgc.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/huicanvaswsbitgc.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/huicanvaswsbitgc.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -208,7 +208,7 @@ return ETrue; } -void CHuiCanvasWsBitGc::ClearCapturingBufferArea(const TRect& aRect) +void CHuiCanvasWsBitGc::ClearCapturingBufferArea(const TRect& /*aRect*/) { } diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/huicanvaswshwgc.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/huicanvaswshwgc.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/huicanvaswshwgc.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -1763,7 +1763,7 @@ } } -void CHuiCanvasWsHwGc::BeginDrawL(TRect aDisplayRect,const CHuiCanvasVisual& aUser, TBool aIsCachePrepared, const TRegion& aUpdateRegion) +void CHuiCanvasWsHwGc::BeginDrawL(TRect /*aDisplayRect*/,const CHuiCanvasVisual& aUser, TBool aIsCachePrepared, const TRegion& aUpdateRegion) { CHuiCanvasRenderBuffer* renderbuffer = NULL; TRect updatedRect = aUpdateRegion.BoundingRect(); @@ -1814,7 +1814,7 @@ iCanvasGc->RestoreFlaggedState(); } -void CHuiCanvasWsHwGc::BeginScanL(TRect aDisplayRect,const CHuiCanvasVisual& aUser, TBool aIsCachePrepared, const TRegion& aUpdateRegion) +void CHuiCanvasWsHwGc::BeginScanL(TRect /*aDisplayRect*/,const CHuiCanvasVisual& aUser, TBool aIsCachePrepared, const TRegion& aUpdateRegion) { CHuiCanvasRenderBuffer* renderbuffer = NULL; TRect updatedRect = aUpdateRegion.BoundingRect(); @@ -1957,7 +1957,7 @@ } } -void CHuiCanvasWsHwGc::EndScanL(const TRegion& aUpdateRegion, TBool aUpdateDisplay) +void CHuiCanvasWsHwGc::EndScanL(const TRegion& /*aUpdateRegion*/, TBool /*aUpdateDisplay*/) { CHuiCanvasRenderBuffer* renderbuffer = NULL; diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/coretoolkit/src/huicanvaswsswgc.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/huicanvaswsswgc.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/huicanvaswsswgc.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -202,15 +202,13 @@ } } -void CHuiCanvasWsSwGc::WsCombinedBitBltMaskedL(TRect aDestinationRect, const RArray& aBlits) +void CHuiCanvasWsSwGc::WsCombinedBitBltMaskedL(TRect /*aDestinationRect*/, const RArray& aBlits) { if (!IsRenderingEnabled()) { return; } - TRect adjustedDestinationRect(aDestinationRect); - for (TInt i=0; i iLowOnMemWgs; + + TInt iTotalMem; }; diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/goommonitor/src/goomcloseapp.cpp --- a/uiacceltk/hitchcock/goommonitor/src/goomcloseapp.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/goommonitor/src/goomcloseapp.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -76,7 +76,14 @@ TRACES2("CGOomCloseApp::FreeMemory: Closing app with window group id %d Timeout = %d",iWgId, iCloseTimeout); iCurrentTask.EndTask(); */ - ConditionalClose(); + if(iCloseTimeout) + { + ConditionalClose(); + } + else + { + KillTask(); + } } CGOomCloseApp::~CGOomCloseApp() diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/goommonitor/src/goomconfigparser.cpp --- a/uiacceltk/hitchcock/goommonitor/src/goomconfigparser.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/goommonitor/src/goomconfigparser.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -131,7 +131,7 @@ _LIT8(KGOomAttributeSkipPlugin, "skip_plugin"); _LIT8(KGOomAttributeUseSwRendering, "use_sw_rend"); _LIT8(KGOomConfigUseSwRend, "Yes"); -_LIT8(KGOomConfigNotUseSwRend, "No"); +//_LIT8(KGOomConfigNotUseSwRend, "No"); // System plugins diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/goommonitor/src/goommemorymonitor.cpp --- a/uiacceltk/hitchcock/goommonitor/src/goommemorymonitor.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/goommonitor/src/goommemorymonitor.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -180,6 +180,8 @@ iLogger = CGOomLogger::NewL(iWs, iFs); #endif + GetFreeMemory(); //update the total memory + // Get the thresholds based on the current foreground app and the config RefreshThresholds(); @@ -524,12 +526,12 @@ // if allocation should fail, threshold should not naturally be set if (!iMemAllocationsGrowing) { - TRAP_IGNORE(iMemAllocationsGrowing = CreateThresholdCrossedThreadL(*this, EGL_PROF_TOTAL_MEMORY_USAGE_GT_NOK, iLowThreshold)) + TRAP_IGNORE(iMemAllocationsGrowing = CreateThresholdCrossedThreadL(*this, EGL_PROF_TOTAL_MEMORY_USAGE_GT_NOK, iLowThreshold, iTotalMem)) origLow = iLowThreshold; // do not reset } if (!iMemAllocationsGoingDown) { - TRAP_IGNORE(iMemAllocationsGoingDown = CreateThresholdCrossedThreadL(*this, EGL_PROF_TOTAL_MEMORY_USAGE_LT_NOK, iGoodThreshold)) + TRAP_IGNORE(iMemAllocationsGoingDown = CreateThresholdCrossedThreadL(*this, EGL_PROF_TOTAL_MEMORY_USAGE_LT_NOK, iGoodThreshold, iTotalMem)) origGood = iGoodThreshold; // do not reset } @@ -643,7 +645,7 @@ EGLint data_count; EGLint* prof_data; TInt i(0); - TInt totalMem(0); + TInt totalUsed(0); EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); @@ -689,8 +691,8 @@ } case EGL_PROF_TOTAL_MEMORY_NOK: { - totalMem = prof_data[i++]; - TRACES1("EGL_NOK_resource_profiling - total Mem: %d", totalMem); + iTotalMem = prof_data[i++]; + TRACES1("EGL_NOK_resource_profiling - total Mem: %d", iTotalMem); break; } case EGL_PROF_PROCESS_ID_NOK: @@ -707,14 +709,12 @@ } case EGL_PROF_PROCESS_USED_PRIVATE_MEMORY_NOK: { - TUint mem = prof_data[i]; - TRACES1("Private memory Usage by app is %d", mem); + TRACES1("Private memory Usage by app is %d", prof_data[i]); break; } case EGL_PROF_PROCESS_USED_SHARED_MEMORY_NOK: { - TUint mem = prof_data[i]; - TRACES1("Shared memory Usage by app is %d", mem); + TRACES1("Shared memory Usage by app is %d", prof_data[i]); break; } default: @@ -729,11 +729,11 @@ User::Free(prof_data); - if ((totalMem-totalUsed) < 0) + if ((iTotalMem-totalUsed) < 0) { return 0; } - return totalMem - totalUsed; + return iTotalMem - totalUsed; } TBool CMemoryMonitor::DoPostponedMemoryGood() diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/goommonitor/src/goomthresholdcrossedao.inl --- a/uiacceltk/hitchcock/goommonitor/src/goomthresholdcrossedao.inl Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/goommonitor/src/goomthresholdcrossedao.inl Thu Oct 14 18:35:08 2010 +0300 @@ -30,13 +30,14 @@ NONSHARABLE_CLASS(CGoomThresholdCrossed): public CActive { public: - CGoomThresholdCrossed(CMemoryMonitor& aMonitor, TUint aAction, TInt aThreshold) + CGoomThresholdCrossed(CMemoryMonitor& aMonitor, TUint aAction, TInt aThreshold, TInt aTotalMem) :CActive(CActive::EPriorityHigh), iMarkerState(KErrNotFound), iActiveThreshold(aThreshold), iAction(aAction), iThread(RThread().Id()), - iMonitor(aMonitor) + iMonitor(aMonitor), + iTotalMem(aTotalMem) { FUNC_LOG; CActiveScheduler::Add(this); @@ -145,12 +146,12 @@ { iStop.Wait(); iStop.Signal(); - TUint usedThreshold = Min(iActiveThreshold,32*1024*1024) ; + TUint usedThreshold = Min(iActiveThreshold,iTotalMem) ; TUint action = iAction; const EGLint sync_attribs[] = { EGL_SYNC_CONDITION_KHR, action, - EGL_PROF_MEMORY_USAGE_THRESHOLD_NOK, 32*1024*1024-usedThreshold, + EGL_PROF_MEMORY_USAGE_THRESHOLD_NOK, iTotalMem-usedThreshold, EGL_NONE }; @@ -283,6 +284,7 @@ EGLDisplay iDpy; TBool iPaused; RCriticalSection iStop; + TInt iTotalMem; }; // --------------------------------------------------------------------------- @@ -306,10 +308,10 @@ return err; } -CGoomThresholdCrossed* CreateThresholdCrossedThreadL(CMemoryMonitor& aMonitor, TUint aAction, TInt aThreshold) +CGoomThresholdCrossed* CreateThresholdCrossedThreadL(CMemoryMonitor& aMonitor, TUint aAction, TInt aThreshold, TInt aTotalMem) { FUNC_LOG; - CGoomThresholdCrossed* ao = new (ELeave) CGoomThresholdCrossed(aMonitor, aAction, aThreshold); + CGoomThresholdCrossed* ao = new (ELeave) CGoomThresholdCrossed(aMonitor, aAction, aThreshold, aTotalMem); CleanupStack::PushL(ao); RThread syncThread; diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/plugins/alfoogmplugin/group/alfoogmplugin.mmp --- a/uiacceltk/hitchcock/plugins/alfoogmplugin/group/alfoogmplugin.mmp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/plugins/alfoogmplugin/group/alfoogmplugin.mmp Thu Oct 14 18:35:08 2010 +0300 @@ -37,6 +37,8 @@ USERINCLUDE . USERINCLUDE ../inc +SYSTEMINCLUDE ../../../../../inc + TARGETPATH /sys/bin SOURCEPATH ../src SOURCE alfoogmplugin.cpp diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/plugins/alftranseffect/alfgfxtransadapter/group/gfxtransenginetfx.mmp --- a/uiacceltk/hitchcock/plugins/alftranseffect/alfgfxtransadapter/group/gfxtransenginetfx.mmp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/plugins/alftranseffect/alfgfxtransadapter/group/gfxtransenginetfx.mmp Thu Oct 14 18:35:08 2010 +0300 @@ -36,6 +36,7 @@ SYSTEMINCLUDE ../../../../CommonInc SYSTEMINCLUDE ../../alftranseffectplugin/inc SYSTEMINCLUDE ../../alftfxserverplugin/inc +SYSTEMINCLUDE ../../../../../../inc USERINCLUDE ../inc USERINCLUDE ../../../../CommonInc diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/plugins/alftranseffect/alftfxserverplugin/group/AlfTfxSrvPlugin.mmp --- a/uiacceltk/hitchcock/plugins/alftranseffect/alftfxserverplugin/group/AlfTfxSrvPlugin.mmp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/plugins/alftranseffect/alftfxserverplugin/group/AlfTfxSrvPlugin.mmp Thu Oct 14 18:35:08 2010 +0300 @@ -50,6 +50,7 @@ SYSTEMINCLUDE /epoc32/include/ecom //Platform security SYSTEMINCLUDE /epoc32/include/caf SYSTEMINCLUDE ../../../../CommonInc +SYSTEMINCLUDE ../../../../../../inc USERINCLUDE ../inc USERINCLUDE ../../../../CommonInc diff -r 57d26d31c595 -r 5dafecb0892a uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/src/alfserverdrawer.cpp --- a/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/src/alfserverdrawer.cpp Tue Sep 28 14:40:28 2010 +0300 +++ b/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/src/alfserverdrawer.cpp Thu Oct 14 18:35:08 2010 +0300 @@ -836,9 +836,9 @@ // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // -TInt CAlfServerDrawer::SendEndFullscreen(TBool aTimeout) +TInt CAlfServerDrawer::SendEndFullscreen(TBool /*aTimeout*/) { - __ALFFXLOGSTRING3("CAlfServerDrawer::SendEndFullscreen - Timeout: %d, iFullScreenEndSent: %d, IsStartEffect: %d", aTimeout, iFullScreenEndSent, iFullScreenTimeout->iIsStartEffect); + __ALFFXLOGSTRING2("CAlfServerDrawer::SendEndFullscreen - iFullScreenEndSent: %d, IsStartEffect: %d", iFullScreenEndSent, iFullScreenTimeout->iIsStartEffect); if ( iFullScreenEndSent ) {