diff -r 06ff229162e9 -r 11d3954df52a src/hbcore/image/hbiconengine_p.h --- a/src/hbcore/image/hbiconengine_p.h Fri May 14 16:09:54 2010 +0300 +++ b/src/hbcore/image/hbiconengine_p.h Thu May 27 13:10:59 2010 +0300 @@ -78,6 +78,9 @@ void setColor(const QColor &color); QColor color() const; + void setThemedColor(const QColor &color); + QColor themedColor() const; + void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, @@ -101,6 +104,7 @@ void removeAllBadges(); const QList badges() const; HbIconFormatType iconFormatType() const; + private: void ensureSignalConnections(); QPixmap getPixmapFromAnimation() const; @@ -114,8 +118,16 @@ HbIconAnimation *animation() const; +public: + enum ClearingFlag { + ResetIconSize = 0x01, + KeepDefaultSize = 0x02, + UnloadedByServer = 0x04 + }; + Q_DECLARE_FLAGS(ClearingFlags, ClearingFlag) + public slots: - void clearStoredIconContent(bool resetIconSize = false, bool unloadedByServer = false); + void clearStoredIconContent(ClearingFlags flags = 0); void clearStoredNonAnimIconContent(); private slots: @@ -131,4 +143,6 @@ HbIconEnginePrivate *d; }; +Q_DECLARE_OPERATORS_FOR_FLAGS(HbIconEngine::ClearingFlags) + #endif // HBICONENGINE_P_H