--- a/contentstorage/caclient/s60/src/cabitmapadapter.cpp	Fri Jul 23 14:03:00 2010 +0300
+++ b/contentstorage/caclient/s60/src/cabitmapadapter.cpp	Fri Aug 06 13:40:46 2010 +0300
@@ -31,43 +31,11 @@
 #include "cadef.h"
 #include "cabitmapadapter.h"
 
-// -----------------------------------------------------------------------------
-// copying compressed bitmap
-//----------------------------------------------------------------------------
-CFbsBitmap *CaBitmapAdapter::copyBitmapLC(CFbsBitmap *input)
-{
-    CFbsBitmap *bmp = new(ELeave) CFbsBitmap();
-    CleanupStack::PushL(bmp);
-    bmp->Create(input->SizeInPixels(), input->DisplayMode());
-
-    CFbsBitmapDevice *bitmapDevice = CFbsBitmapDevice::NewL(bmp);
-    CleanupStack::PushL(bitmapDevice);
-    CFbsBitGc *bmpGc;
-    bitmapDevice->CreateContext(bmpGc);
-    bmpGc->BitBlt(TPoint(0,0), input);
-    delete bmpGc;
-    CleanupStack::PopAndDestroy(bitmapDevice);
-    return bmp;
-}
-
 void CaBitmapAdapter::fromBitmapAndMaskToPixmapL(CFbsBitmap* fbsBitmap,
         CFbsBitmap* fbsMask, QPixmap& pixmap)
 {
-    if (fbsBitmap->Header().iCompression == ENoBitmapCompression) {
-        pixmap = pixmap.fromSymbianCFbsBitmap(fbsBitmap);
-        QPixmap mask;
-        mask = mask.fromSymbianCFbsBitmap(fbsMask);
-        pixmap.setAlphaChannel(mask);
-    } else { // we need special handling for icons in 9.2 (NGA)
-        // let's hope that in future it will be in QT code
-        CFbsBitmap *temp(NULL);
-        temp = CaBitmapAdapter::copyBitmapLC(fbsBitmap);
-        pixmap = pixmap.fromSymbianCFbsBitmap(temp);
-        CleanupStack::PopAndDestroy();
-        temp = CaBitmapAdapter::copyBitmapLC(fbsMask);
-        QPixmap mask;
-        mask = mask.fromSymbianCFbsBitmap(temp);
-        CleanupStack::PopAndDestroy();
-        pixmap.setAlphaChannel(mask);
-    }
+    pixmap = pixmap.fromSymbianCFbsBitmap(fbsBitmap);
+    QPixmap mask;
+    mask = mask.fromSymbianCFbsBitmap(fbsMask);
+    pixmap.setAlphaChannel(mask);
 }