diff -r fcdfafb36fe7 -r aecbbf00d063 uifw/AvKon/aknhlist/inc/akntree.h --- a/uifw/AvKon/aknhlist/inc/akntree.h Thu Aug 19 10:11:06 2010 +0300 +++ b/uifw/AvKon/aknhlist/inc/akntree.h Tue Aug 31 15:28:30 2010 +0300 @@ -22,7 +22,6 @@ #include // TScaleMode #include -#include #include "akntreenode.h" #include "akntreeobserver.h" @@ -64,7 +63,7 @@ * @lib aknhlist.lib * @since S60 v3.2 */ -NONSHARABLE_CLASS( CAknTree ) : public CAknTreeNode, public MAknSmileyObserver +NONSHARABLE_CLASS( CAknTree ) : public CAknTreeNode { public: @@ -868,50 +867,6 @@ */ void Collapse(); - /** - * Init smiley manager in this tree. - * @since S60 5.2 - */ - void InitSmiley(); - - /** - * Draw smiley icon when aText contains simely text, otherwise it is as same - * as @c DrawText. - * - * @param aGc Graphics context. - * - * @param aRect Parent rectangle for the text layout. - * - * @param aTextLayout Text layout. - * - * @param aText Text. - * - * @param aFont Font. @c NULL if the font defined in layout is used. - * - * @param aFocused @c ETrue, if the text is drawn for focused tree list - * item, otherwise @c EFalse. - * - * @since S60 5.2 - */ - void DrawSmiley( CWindowGc& aGc, const TRect& aRect, - const TAknTextComponentLayout& aTextLayout, - const TDesC& aText, const CFont* aFont, - TBool aFocused ); - - /** - * Use smiley manager to convert smiley text to placehodler. - * - * @param aText Text to be processed. - * @return How many smiley icon found in aText. Or leave code if there is - * any problem. - * @since S60 5.2 - */ - TInt ConvertTextToSmiley( TDes& aText ); - -private: // from MAknSmileyObserver - void SmileyStillImageLoaded( CAknSmileyIcon* aSmileyIcon ); - void SmileyAnimationChanged( CAknSmileyIcon* aSmileyIcon ); - private: /** @@ -1040,15 +995,6 @@ */ TBitFlags32 iFlags; - /** - * Smiley manager. owned - */ - CAknSmileyManager* iSmileyMan; - - /** - * Smiley icon size - */ - TSize iSmileySize; };