diff -r 4eb1ae11334f -r e6a39382bb9c textinput/peninputcommonctrls/src/peninputbuttons/peninputbutton.cpp --- a/textinput/peninputcommonctrls/src/peninputbuttons/peninputbutton.cpp Wed Apr 14 16:18:34 2010 +0300 +++ b/textinput/peninputcommonctrls/src/peninputbuttons/peninputbutton.cpp Tue Apr 27 16:59:43 2010 +0300 @@ -162,7 +162,7 @@ if (bmpMskId != KInvalidBmp) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, maskbmp, @@ -176,7 +176,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, bmpFileName, @@ -243,7 +243,7 @@ if (bmpMskId != KInvalidBmp) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, maskbmp, @@ -257,7 +257,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, bmpFileName, @@ -548,7 +548,7 @@ if (bmpMskId != KInvalidBmp) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, maskbmp, @@ -561,7 +561,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, bmpFileName, @@ -604,7 +604,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForgroundBmp, iForgroundBmpMask, @@ -614,7 +614,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id, KAknsIIDQsnIconColors, colorGroup, @@ -637,7 +637,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForgroundBmp, bmpFileName, @@ -699,7 +699,7 @@ if (bmpMskId != KInvalidBmp) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, maskbmp, @@ -712,7 +712,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, bmpFileName, @@ -766,7 +766,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForgroundBmp, iForgroundBmpMask, @@ -776,7 +776,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id, KAknsIIDQsnIconColors, colorGroup, @@ -798,7 +798,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForgroundBmp, bmpFileName, @@ -983,7 +983,7 @@ // Draw background if( IsDimmed() ) // Dimmed state { - AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), + AknsDrawUtils::DrawFrame( UiLayout()->SkinInstance(), *gc, rect, innerRect, @@ -1004,7 +1004,7 @@ { // Normal state or pressed state TAknsItemID ImgID = (IsDragging() | PointerDown()) ? iPressedImgID : iNormalImgID; - AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), + AknsDrawUtils::DrawFrame( UiLayout()->SkinInstance(), *gc, rect, innerRect, @@ -1234,7 +1234,7 @@ TAknsItemID id; id.Set(TInt(colorMajorSkinId), skinitemid); - TInt error = AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), + TInt error = AknsUtils::GetCachedColor(UiLayout()->SkinInstance(), iFontColor, id, textcoloridx); @@ -1246,7 +1246,7 @@ SetFontColor(iFontColor); - error = AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), + error = AknsUtils::GetCachedColor(UiLayout()->SkinInstance(), iShadowFontColor, id, shadowtextcoloridx); @@ -1337,7 +1337,7 @@ TAknsItemID id; id.Set(TInt(colorMajorSkinId), skinitemid); - TInt error = AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), + TInt error = AknsUtils::GetCachedColor(UiLayout()->SkinInstance(), iFontColor, id, textcoloridx); @@ -1349,7 +1349,7 @@ SetFontColor(iFontColor); - error = AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), + error = AknsUtils::GetCachedColor(UiLayout()->SkinInstance(), iShadowFontColor, id, shadowtextcoloridx); @@ -1452,7 +1452,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, maskbmp, @@ -1462,7 +1462,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id, KAknsIIDQsnIconColors, colorGroup, @@ -1483,7 +1483,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, bmp, bmpFileName, @@ -1934,6 +1934,7 @@ // void CAknFepCtrlMultiModeButton::GetRangeListL(RArray& aList) { + CleanupClosePushL( aList ); for (TInt i = 0; i < NumberOfModes(); i++) { if (aList.Find(iModesList[i]->iRangeId) == KErrNotFound) @@ -1941,6 +1942,7 @@ aList.AppendL(iModesList[i]->iRangeId); } } + CleanupStack::Pop(); } // ----------------------------------------------------------------------------- @@ -2844,7 +2846,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForgroundBmp, iForgroundBmpMask, @@ -2854,7 +2856,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id, KAknsIIDQsnIconColors, colorGroup, @@ -2876,7 +2878,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForgroundBmp, bmpFileName, @@ -2936,7 +2938,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForgroundBmp, iForgroundBmpMask, @@ -2946,7 +2948,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id, KAknsIIDQsnIconColors, colorGroup, @@ -2968,7 +2970,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForgroundBmp, bmpFileName, @@ -3017,7 +3019,7 @@ // Draw background if( IsDimmed() ) // Dimmed state { - AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), + AknsDrawUtils::DrawFrame( UiLayout()->SkinInstance(), *gc, rect, innerRect, @@ -3048,7 +3050,7 @@ ImgID = /*iPressed*/PointerDown()? iPressedImgID : iNormalImgID; } - AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), + AknsDrawUtils::DrawFrame( UiLayout()->SkinInstance(), *gc, rect, innerRect, @@ -3101,7 +3103,7 @@ TRgb color( KRgbBlack ); // sane default for nonskinned case if ( AknsUtils::AvkonSkinEnabled() ) { - AknsUtils::GetCachedColor( AknsUtils::SkinInstance(), + AknsUtils::GetCachedColor( UiLayout()->SkinInstance(), color, KAknsIIDQsnTextColors, iTextColorIndex ); } if( IsDimmed() ) @@ -3531,7 +3533,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForground1Bmp, iForground1BmpMask, @@ -3541,7 +3543,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id, KAknsIIDQsnIconColors, colorGroup, @@ -3563,7 +3565,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForground1Bmp, bmpFileName, @@ -3590,7 +3592,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id2, iForground2Bmp, iForground2BmpMask, @@ -3600,7 +3602,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id2, KAknsIIDQsnIconColors, colorGroup, @@ -3622,7 +3624,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id2, iForground2Bmp, bmpFileName, @@ -3679,7 +3681,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForground1Bmp, iForground1BmpMask, @@ -3689,7 +3691,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id, KAknsIIDQsnIconColors, colorGroup, @@ -3710,7 +3712,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForground1Bmp, bmpFileName, @@ -3746,7 +3748,7 @@ { if( colorGroup == KInvalidColorGroup ) { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id2, iForground2Bmp, iForground2BmpMask, @@ -3756,7 +3758,7 @@ } else { - AknsUtils::CreateColorIconL( AknsUtils::SkinInstance(), + AknsUtils::CreateColorIconL( UiLayout()->SkinInstance(), id, KAknsIIDQsnIconColors, colorGroup, @@ -3777,7 +3779,7 @@ } else { - AknsUtils::CreateIconL(AknsUtils::SkinInstance(), + AknsUtils::CreateIconL(UiLayout()->SkinInstance(), id, iForground2Bmp, bmpFileName, @@ -3832,7 +3834,7 @@ // Draw background if( IsDimmed() ) // Dimmed state { - AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), + AknsDrawUtils::DrawFrame( UiLayout()->SkinInstance(), *gc, rect, innerRect, @@ -3873,7 +3875,7 @@ ImgID = /*iPressed*/PointerDown()? iPressedImgID : iNormalImgID; } - AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), + AknsDrawUtils::DrawFrame( UiLayout()->SkinInstance(), *gc, rect, innerRect,