diff -r 0b3699f6c654 -r e36b2f4799c0 contentstorage/caclient/s60/src/cabitmapadapter.cpp --- a/contentstorage/caclient/s60/src/cabitmapadapter.cpp Fri Sep 17 08:32:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* - * Copyright (c)2008 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * This component and the accompanying materials are made available - * under the terms of "Eclipse Public License v1.0" - * which accompanies this distribution, and is available - * at the URL "http://www.eclipse.org/legal/epl-v10.html". - * - * Initial Contributors: - * Nokia Corporation - initial contribution. - * - * Contributors: - * - * Description: ?Description - * - */ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "cadef.h" -#include "cabitmapadapter.h" - -void CaBitmapAdapter::fromBitmapAndMaskToPixmapL(CFbsBitmap* fbsBitmap, - CFbsBitmap* fbsMask, QPixmap& pixmap) -{ - pixmap = pixmap.fromSymbianCFbsBitmap(fbsBitmap); - QPixmap mask; - mask = mask.fromSymbianCFbsBitmap(fbsMask); - pixmap.setAlphaChannel(mask); -}