--- a/src/hbcore/image/hbmaskableiconimpl_p.h Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbmaskableiconimpl_p.h Mon May 03 12:48:33 2010 +0300
@@ -48,9 +48,10 @@
}
void paint(QPainter* painter, const QRectF &childRect,
- Qt::Alignment alignment)
+ Qt::Alignment alignment,
+ const QPainterPath &clipPath = QPainterPath())
{
- icon->paint(painter, childRect, alignment, this);
+ icon->paint(painter, childRect, alignment, clipPath, this);
maskApplied = false;
}
@@ -159,12 +160,12 @@
delete this;
}
- void setImplData(IconMaskedData data)
+ void setImplData(HbIconMaskedData *data)
{
this->data = data;
}
- IconMaskedData implData()
+ HbIconMaskedData * implData() const
{
return data;
}
@@ -174,10 +175,10 @@
{
}
- HbIconImpl * icon;
- IconMaskedData data;
- QBitmap maskBitmap;
- bool maskApplied;
+ HbIconImpl *icon;
+ HbIconMaskedData *data;
+ QBitmap maskBitmap;
+ bool maskApplied;
};
#endif