--- a/contentstorage/cautils/inc/cainnerentry.h	Fri Mar 19 09:35:23 2010 +0200
+++ b/contentstorage/cautils/inc/cainnerentry.h	Fri Apr 16 15:16:09 2010 +0300
@@ -35,11 +35,9 @@
         {
         //TODO: maybe it should be C class with RBuf instead of TFileName
         TInt iId;
-        TInt iBitmapId;
-        TInt iMaskId;
-        TInt iSkinMajorId;
-        TInt iSkinMinorId;
         TFileName iFileName;
+        TBuf<KMaxFileName> iSkinId;        
+        TBuf<KMaxUidName> iApplicationId;
         };
 
 public:
@@ -149,14 +147,12 @@
 
     /**
      * Sets icon data.
-     * @param aBitmapId Bitmap id.
-     * @param aMaskId Mask id.
-     * @param aSkinMajorId Skin major id.
-     * @param aSkinMinorId Skin minor id.
      * @param aFilename Filename.
+     * @param aSkinId Skin id.
+     * @param aApplicationId application id.
      */
-    IMPORT_C void SetIconDataL( TInt aBitmapId, TInt aMaskId,
-            TInt aSkinMajorId, TInt aSkinMinorId, const TDesC& aFilename );
+    IMPORT_C void SetIconDataL(             
+            const TDesC& aFilename, const TDesC& aSkinId, const TDesC& aApplicationId );
 
     /**
      * Adds attribute to entry.