# HG changeset patch # User William Roberts # Date 1269710819 0 # Node ID ecca05ffb94733cfac0a4aecd6762c0168a933ba # Parent eea064bd770321099e2076beaa78d53618cf4413 Fix GCCE error: braces around scalar initializer for type 'const TInt' diff -r eea064bd7703 -r ecca05ffb947 camerauis/cameraapp/generic/camerauiconfigmanager/inc/CameraDynamicSettings.hrh --- a/camerauis/cameraapp/generic/camerauiconfigmanager/inc/CameraDynamicSettings.hrh Sun Mar 14 13:08:11 2010 +0000 +++ b/camerauis/cameraapp/generic/camerauiconfigmanager/inc/CameraDynamicSettings.hrh Sat Mar 27 17:26:59 2010 +0000 @@ -132,12 +132,12 @@ // Photo scene settings const TInt KCamColorToneEnums[] = { - { ECamColourFilterColour }, - { ECamColourFilterBlackAndWhite }, - { ECamColourFilterSepia }, - { ECamColourFilterNegative }, - { ECamColourFilterVivid }, - { KCamLastSettingItem } + ECamColourFilterColour, + ECamColourFilterBlackAndWhite, + ECamColourFilterSepia, + ECamColourFilterNegative, + ECamColourFilterVivid, + KCamLastSettingItem }; const TUint16* const KCamColorToneStrings[] = @@ -156,12 +156,12 @@ const TInt KCamWhiteBalanceEnums[] = { - { ECamWhiteBalanceAWB }, - { ECamWhiteBalanceDaylight }, - { ECamWhiteBalanceCloudy }, - { ECamWhiteBalanceTungsten }, - { ECamWhiteBalanceFlourescent }, - { KCamLastSettingItem } + ECamWhiteBalanceAWB, + ECamWhiteBalanceDaylight, + ECamWhiteBalanceCloudy, + ECamWhiteBalanceTungsten, + ECamWhiteBalanceFlourescent, + KCamLastSettingItem }; const TUint16* const KCamWhiteBalanceStrings[] = @@ -180,11 +180,11 @@ */ const TInt KCamFlashModeEnums[] = { - { ECamFlashAuto }, - { ECamFlashForced }, - { ECamFlashAntiRedEye }, - { ECamFlashOff }, - { KCamLastSettingItem } + ECamFlashAuto, + ECamFlashForced, + ECamFlashAntiRedEye, + ECamFlashOff, + KCamLastSettingItem }; const TUint16* const KCamFlashModeStrings[] = @@ -204,56 +204,56 @@ */ const TInt KCamSceneModeEnums[] = { - { ECamSceneAuto }, - { ECamSceneUser }, - { ECamSceneMacro }, - { ECamScenePortrait }, - { ECamSceneScenery }, - { ECamSceneSports }, - { ECamSceneNight }, - { ECamSceneNightPortrait }, - { ECamSceneNormal }, - { ECamSceneLowLight }, + ECamSceneAuto, + ECamSceneUser, + ECamSceneMacro, + ECamScenePortrait, + ECamSceneScenery, + ECamSceneSports, + ECamSceneNight, + ECamSceneNightPortrait, + ECamSceneNormal, + ECamSceneLowLight, // Exposure modes for each scene - { ECamSceneAEModeAuto }, - { ECamSceneAEModeNight }, - { ECamSceneAEModeBacklight }, - { ECamSceneAEModeCenter }, - { ECamSceneAEModeSports }, + ECamSceneAEModeAuto, + ECamSceneAEModeNight, + ECamSceneAEModeBacklight, + ECamSceneAEModeCenter, + ECamSceneAEModeSports, // AF modes for each scene - { ECamSceneAFModeMacro }, - { ECamSceneAFPortrait }, - { ECamSceneAFModeNormal }, - { ECamSceneAFModeInfinity }, - { ECamSceneAFModeHyperfocal }, - { ECamSceneAFModeContinuous }, + ECamSceneAFModeMacro, + ECamSceneAFPortrait, + ECamSceneAFModeNormal, + ECamSceneAFModeInfinity, + ECamSceneAFModeHyperfocal, + ECamSceneAFModeContinuous, // flash mode - { ECamFlashAuto }, - { ECamFlashForced }, - { ECamFlashAntiRedEye }, - { ECamFlashOff }, + ECamFlashAuto, + ECamFlashForced, + ECamFlashAntiRedEye, + ECamFlashOff, // white balance ecam - { ECamWhiteBalanceAWB }, - { ECamWhiteBalanceDaylight }, - { ECamWhiteBalanceCloudy }, - { ECamWhiteBalanceTungsten }, - { ECamWhiteBalanceFlourescent }, + ECamWhiteBalanceAWB, + ECamWhiteBalanceDaylight, + ECamWhiteBalanceCloudy, + ECamWhiteBalanceTungsten, + ECamWhiteBalanceFlourescent, // light sensitivity enums - { ECamLightSensitivityAuto }, - { ECamLightSensitivityLow }, - { ECamLightSensitivityLowMed }, - { ECamLightSensitivityMed }, - { ECamLightSensitivityMedHigh }, - { ECamLightSensitivityHigh }, + ECamLightSensitivityAuto, + ECamLightSensitivityLow, + ECamLightSensitivityLowMed, + ECamLightSensitivityMed, + ECamLightSensitivityMedHigh, + ECamLightSensitivityHigh, // sharpness modes that ui supports - { ECamImageSharpnessNorm }, - { ECamImageSharpnessSoft }, - { ECamImageSharpnessHard }, + ECamImageSharpnessNorm, + ECamImageSharpnessSoft, + ECamImageSharpnessHard, // contrast modes that ui supports - { ECamContrastNorm }, - { ECamContrastPlus }, - { ECamContrastNeg }, - { KCamLastSettingItem } + ECamContrastNorm, + ECamContrastPlus, + ECamContrastNeg, + KCamLastSettingItem }; /*