--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h	Mon Oct 04 00:38:12 2010 +0300
@@ -149,7 +149,7 @@
     static bool gpuGoodMemoryState;
     HbRenderingMode renderMode;
     CHbThemeChangeNotificationListener * iListener;
-    CHbThemeWatcher *iWatcher;
+    HbThemeWatcher *iWatcher;
 };
 
 //**********************************
@@ -173,14 +173,14 @@
     void HandleDeviceProfilesReqL(const RMessage2& aMessage);
     void HandleEffectAddAndFileLookupL(const RMessage2 &aMessage);
     QColor GetColorFromRgba(TUint32 aRgba, bool aColorFlag);
-    HbIconCacheItem* getCachedIcon(HbIconKey & key, const QString & format);
+    HbIconCacheItem* getCachedIcon(HbIconKey &key, const QString &format);
     void GetSharedMultiIconInfoL(const RMessage2& aMessage);
     void GetMultiIconInfoL(const RMessage2& aMessage);
     TMultiIconSymbParams ReadMessageAndRetrieveMultiIconParams(const RMessage2& aMessage);
     void GetDataFromCacheItem(HbIconCacheItem* cacheItem, HbSharedIconInfo &data) const;
     void FreeDataFromCacheItem(HbIconCacheItem* cacheItem);
-    bool IconInfoFromSingleIcon(HbIconKey key, HbSharedIconInfo &stitchedData, const QString & format);
-    bool CreateCacheItemData(HbIconKey key, int options, HbSharedIconInfo &data,
+    bool IconInfoFromSingleIcon(HbIconKey &key, HbSharedIconInfo &stitchedData, const QString & format);
+    bool CreateCacheItemData(const HbIconKey &key, int options, HbSharedIconInfo &data,
                              bool isMultiPiece = false);
     bool CreateStichedIconInfoOfParts(QVector<HbSharedIconInfo> dataForParts,
                                       HbMultiIconParams params,