--- a/uifw/EikStd/coctlsrc/smileymodel.cpp	Wed Sep 01 12:16:19 2010 +0100
+++ b/uifw/EikStd/coctlsrc/smileymodel.cpp	Tue Sep 14 21:48:24 2010 +0300
@@ -15,8 +15,7 @@
 *
 */
 
-//#include <streamlogger.h>
-
+#include <AknSmileyUtils.h>
 #include "smileymanager.h"
 #include "smileymodel.h"
 
@@ -205,8 +204,8 @@
 //
 void CSmileyModel::AddSimleyL( CSmileyInfo& aInfo )
     {
-    if ( aInfo.iImageInfo.iCode < CSmileyManager::KSmileyCodeMin || 
-        aInfo.iImageInfo.iCode > CSmileyManager::KSmileyCodeMax || 
+    if ( aInfo.iImageInfo.iCode < CAknSmileyManager::KSmileyCodeMin || 
+        aInfo.iImageInfo.iCode > CAknSmileyManager::KSmileyCodeMax || 
         aInfo.iStrArray.Count() == 0 )
         {
         return;
@@ -383,11 +382,11 @@
     TInt len( iLinkArray[linkIndex].iStrLength );
     TInt imageIndex( iLinkArray[linkIndex].iImageIndex );
     aText[aDocPos] = iImageInfoArray[imageIndex].iCode;
-    aText[aDocPos + 1] = CSmileyManager::KCompensateChar;
+    aText[aDocPos + 1] = CAknSmileyManager::KCompensateChar;
     const TInt KThirdIndex = 2;
     for ( TInt i( KThirdIndex ); i < len; i++ )
         {
-        aText[i + aDocPos] = CSmileyManager::KPlaceHolder;
+        aText[i + aDocPos] = CAknSmileyManager::KPlaceHolder;
         }
     }