diff -r f0c0788c4de2 -r 756ad29ed18e camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp --- a/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp Wed Sep 15 11:51:19 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp Wed Oct 13 14:09:54 2010 +0300 @@ -182,7 +182,7 @@ iListBox->DisableSingleClick( ETrue ); TRect listboxRect; - if ( AknLayoutUtils::PenEnabled() ) + if ( CamUtility::IsNhdDevice() ) { listboxRect = TouchLayout(); } @@ -514,7 +514,7 @@ PRINT(_L("Camera => CCamShootingModeContainer::Draw") ) CWindowGc& gc = SystemGc(); - if ( AknLayoutUtils::PenEnabled() ) + if ( CamUtility::IsNhdDevice() ) { TRgb color; if( iFullySkinned ) @@ -616,7 +616,7 @@ if ( EStdKeyUpArrow == aKeyEvent.iScanCode || EStdKeyDownArrow == aKeyEvent.iScanCode ) { - if ( AknLayoutUtils::PenEnabled() ) + if ( CamUtility::IsNhdDevice() ) { ShowTooltipL(); } @@ -674,11 +674,9 @@ { // the description of the icon HBufC* Description; - TInt DescResouceId = R_CAM_SCENE_DESCRIPTION_LANDSCAPE_AUTOFOCUS; - Description = StringLoader::LoadL( DescResouceId ); + TInt description = R_CAM_SCENE_DESCRIPTION_LANDSCAPE_AUTOFOCUS; + Description = StringLoader::LoadL( description ); User::LeaveIfError( iDescArray.Append( Description ) ); - delete descr; - descr = NULL; } else {