--- a/contentstorage/castorage/inc/casqlcommands.h	Tue Mar 23 23:42:03 2010 +0200
+++ b/contentstorage/castorage/inc/casqlcommands.h	Tue Mar 23 23:55:55 2010 +0200
@@ -49,9 +49,8 @@
 VALUES ( :GE_GROUP_ID, :GE_ENTRY_ID, :GE_POSITION )" );
 
 _LIT( KSQLInsertToIcon, "INSERT INTO CA_ICON \
-(IC_FILENAME,IC_BITMAP_ID,IC_MASK_ID,IC_SKINMAJOR_ID,IC_SKINMINOR_ID) \
-VALUES ( :IC_FILENAME, :IC_BITMAP_ID, :IC_MASK_ID, \
-:IC_SKINMAJOR_ID, :IC_SKINMINOR_ID )" );
+(IC_FILENAME,IC_SKIN_ID,IC_APP_ID) \
+VALUES ( :IC_FILENAME, :IC_SKIN_ID, :IC_APP_ID )" );
 
 _LIT( KSQLInsertToLaunch, "INSERT INTO CA_LAUNCH \
 (LA_ENTRY_ID, LA_LAUNCH_TIME) \
@@ -96,10 +95,8 @@
 // Update Icon
 _LIT( KSQLUpdateIconId, "ICON_ID = :ICON_ID " );
 _LIT( KSQLUpdateIconFileName, "IC_FILENAME = :IC_FILENAME " );
-_LIT( KSQLUpdateIconBitmapId, "IC_BITMAP_ID = :IC_BITMAP_ID " );
-_LIT( KSQLUpdateIconMaskId, "IC_MASK_ID = :IC_MASK_ID " );
-_LIT( KSQLUpdateIconSkinMajorId, "IC_SKINMAJOR_ID = :IC_SKINMAJOR_ID " );
-_LIT( KSQLUpdateIconSkinMinorId, "IC_SKINMINOR_ID = :IC_SKINMINOR_ID " );
+_LIT( KSQLUpdateIconSkinId, "IC_SKIN_ID = :IC_SKIN_ID " );
+_LIT( KSQLUpdateIconAppId, "IC_APP_ID = :IC_APP_ID " );
 _LIT( KSQLUpdateIconWhere, "WHERE ICON_ID = :ICON_ID" );
 
 // Update property
@@ -136,18 +133,18 @@
 
 _LIT( KSQLGetListByEntryIds, "SELECT ENTRY_ID, EN_TEXT, EN_DESCRIPTION, \
 EN_ROLE, EN_TYPE_NAME, EN_ICON_ID, EN_CREATION_TIME, EN_UID, EN_FLAGS, \
-IC_FILENAME, IC_BITMAP_ID, IC_MASK_ID, IC_SKINMAJOR_ID, IC_SKINMINOR_ID \
+IC_FILENAME,IC_SKIN_ID,IC_APP_ID \
 FROM CA_ENTRY LEFT JOIN CA_ICON ON EN_ICON_ID = ICON_ID \
 WHERE ENTRY_ID IN ( %S )" );
 
 _LIT( KSQLGetList, "SELECT ENTRY_ID, EN_TEXT, EN_DESCRIPTION, EN_ROLE, \
 EN_TYPE_NAME, EN_ICON_ID, EN_CREATION_TIME, EN_UID, EN_FLAGS, IC_FILENAME, \
-IC_BITMAP_ID, IC_MASK_ID, IC_SKINMAJOR_ID, IC_SKINMINOR_ID FROM \
+IC_SKIN_ID, IC_APP_ID FROM \
 CA_ENTRY LEFT JOIN CA_ICON ON EN_ICON_ID = ICON_ID " );
 
 _LIT( KSQLGetListByParentId, "SELECT ENTRY_ID, EN_TEXT, EN_DESCRIPTION, \
 EN_ROLE, EN_TYPE_NAME, EN_ICON_ID, EN_CREATION_TIME, EN_UID, EN_FLAGS, \
-IC_FILENAME, IC_BITMAP_ID, IC_MASK_ID, IC_SKINMAJOR_ID, IC_SKINMINOR_ID, \
+IC_FILENAME, IC_SKIN_ID, IC_APP_ID, \
 GE_GROUP_ID, GE_ENTRY_ID, GE_POSITION FROM CA_ENTRY  \
 LEFT JOIN CA_ICON ON EN_ICON_ID = ICON_ID LEFT JOIN CA_GROUP_ENTRY ON \
 GE_ENTRY_ID = ENTRY_ID WHERE GE_GROUP_ID = :GE_GROUP_ID %S " );
@@ -162,8 +159,7 @@
 // %S - the input table to work on.
 _LIT( KSQLGetListByLaunchDataPart1,"SELECT ENTRY_ID, EN_TEXT, \
 EN_DESCRIPTION, EN_ROLE, EN_TYPE_NAME, EN_ICON_ID, EN_CREATION_TIME, \
-EN_UID, EN_FLAGS, IC_FILENAME, IC_BITMAP_ID, IC_MASK_ID, IC_SKINMAJOR_ID, \
-IC_SKINMINOR_ID FROM (");
+EN_UID, EN_FLAGS, IC_FILENAME, IC_SKIN_ID, IC_APP_ID FROM (");
 
 // %S - the table to match e.g KSQLGetMostUsed or KSQLGetLastUsed
 // The column USAGE_DATA is used to order the items
@@ -178,10 +174,8 @@
 
 _LIT( KSQLGetIconId,"SELECT ICON_ID AS Data FROM CA_ICON \
 WHERE IC_FILENAME = :IC_FILENAME AND \
-IC_BITMAP_ID = :IC_BITMAP_ID AND \
-IC_MASK_ID = :IC_MASK_ID AND \
-IC_SKINMAJOR_ID = :IC_SKINMAJOR_ID AND \
-IC_SKINMINOR_ID = :IC_SKINMINOR_ID");
+IC_SKIN_ID = :IC_SKIN_ID AND \
+IC_APP_ID = :IC_APP_ID");
 
 _LIT( KSQLGetEntryIdFromEntryTable,"SELECT ENTRY_ID AS Data FROM CA_ENTRY \
 WHERE ENTRY_ID = :ENTRY_ID");
@@ -189,13 +183,12 @@
 _LIT( KSQLGETIconIdFromEntryTable, "SELECT EN_ICON_ID AS Data FROM CA_ENTRY \
 WHERE ENTRY_ID = :ENTRY_ID");
 
-_LIT( KSQLGetIconDataByIdIcon,"SELECT ICON_ID, IC_FILENAME, IC_BITMAP_ID, \
-IC_MASK_ID, IC_SKINMAJOR_ID, IC_SKINMINOR_ID \
+_LIT( KSQLGetIconDataByIdIcon,"SELECT ICON_ID, IC_FILENAME, IC_SKIN_ID, IC_APP_ID \
 FROM CA_ICON WHERE ICON_ID = :EN_ICON_ID");
 
 _LIT( KSQLGetIconsItems,"SELECT ENTRY_ID, EN_TEXT, EN_DESCRIPTION, EN_ROLE, \
 EN_TYPE_NAME, EN_ICON_ID, EN_CREATION_TIME, EN_UID, EN_FLAGS, IC_FILENAME, \
-IC_BITMAP_ID, IC_MASK_ID, IC_SKINMAJOR_ID, IC_SKINMINOR_ID FROM \
+IC_SKIN_ID, IC_APP_ID FROM \
 CA_ENTRY LEFT JOIN CA_ICON ON EN_ICON_ID = ICON_ID \
 WHERE EN_ICON_ID = :EN_ICON_ID");
 
@@ -283,10 +276,8 @@
 
 _LIT( KSQLIconId, ":ICON_ID" );
 _LIT( KSQLIcFileName, ":IC_FILENAME" );
-_LIT( KSQLIcBitmapId, ":IC_BITMAP_ID" );
-_LIT( KSQLIcMaskId, ":IC_MASK_ID" );
-_LIT( KSQLIcSkinMajorId, ":IC_SKINMAJOR_ID" );
-_LIT( KSQLIcSkinMinorId, ":IC_SKINMINOR_ID" );
+_LIT( KSQLIcSkinId, ":IC_SKIN_ID" );
+_LIT( KSQLIcAppId, ":IC_APP_ID" );
 
 _LIT( KSQLLaunchId, ":LAUNCH_ID" );
 _LIT( KSQLLaLaunchTime, ":LA_LAUNCH_TIME" );
@@ -330,10 +321,8 @@
 
 _LIT( KColumnIconId, "ICON_ID" );
 _LIT( KColumnIcFileName, "IC_FILENAME" );
-_LIT( KColumnIcBitmapId, "IC_BITMAP_ID" );
-_LIT( KColumnIcMaskId, "IC_MASK_ID" );
-_LIT( KColumnIcSkinMajorId, "IC_SKINMAJOR_ID" );
-_LIT( KColumnIcSkinMinorId, "IC_SKINMINOR_ID" );
+_LIT( KColumnIcSkinId, "IC_SKIN_ID" );
+_LIT( KColumnIcAppId, "IC_APP_ID" );
 
 _LIT( KColumnLaunchId, "LAUNCH_ID" );
 _LIT( KColumnLaLaunchTime, "LA_LAUNCH_TIME" );