diff -r 1e962b12a8db -r d2f833ab7940 contentstorage/eabi/cautilsu.def
--- a/contentstorage/eabi/cautilsu.def	Tue Jun 01 11:30:17 2010 +0300
+++ b/contentstorage/eabi/cautilsu.def	Fri Jun 11 16:13:51 2010 +0300
@@ -5,7 +5,7 @@
 	_ZN13CCaInnerEntry13AddAttributeLERK7TDesC16S2_ @ 4 NONAME
 	_ZN13CCaInnerEntry13FindAttributeERK7TDesC16R6TDes16 @ 5 NONAME
 	_ZN13CCaInnerEntry13FindAttributeERK7TDesC16R7TPtrC16 @ 6 NONAME
-	_ZN13CCaInnerEntry15SetDescriptionLERK7TDesC16 @ 7 NONAME
+	_ZN13CCaInnerEntry15SetDescriptionLERK7TDesC16i @ 7 NONAME
 	_ZN13CCaInnerEntry16RemoveAttributeLERK7TDesC16 @ 8 NONAME
 	_ZN13CCaInnerEntry17SetEntryTypeNameLERK7TDesC16 @ 9 NONAME
 	_ZN13CCaInnerEntry4NewLEv @ 10 NONAME
@@ -14,7 +14,7 @@
 	_ZN13CCaInnerEntry6SetUidEl @ 13 NONAME
 	_ZN13CCaInnerEntry7SetRoleEj @ 14 NONAME
 	_ZN13CCaInnerEntry8SetFlagsEj @ 15 NONAME
-	_ZN13CCaInnerEntry8SetTextLERK7TDesC16 @ 16 NONAME
+	_ZN13CCaInnerEntry8SetTextLERK7TDesC16i @ 16 NONAME
 	_ZN13CCaInnerEntry9SetIconIdEi @ 17 NONAME
 	_ZN13CCaInnerQuery10SetFlagsOnEj @ 18 NONAME
 	_ZN13CCaInnerQuery11SetFlagsOffEj @ 19 NONAME
@@ -39,63 +39,64 @@
 	_ZN17RCaEntryAttrArray5ExistERK7TDesC16 @ 38 NONAME
 	_ZN20CCaLocalizationEntry12SetStringIdLERK7TDesC16 @ 39 NONAME
 	_ZN20CCaLocalizationEntry13SetTableNameLERK7TDesC16 @ 40 NONAME
-	_ZN20CCaLocalizationEntry17SetAttributeNameLERK7TDesC16 @ 41 NONAME
-	_ZN20CCaLocalizationEntry19SetLocalizedStringLERK7TDesC16 @ 42 NONAME
-	_ZN20CCaLocalizationEntry4NewLEv @ 43 NONAME
-	_ZN20CCaLocalizationEntry5NewLCEv @ 44 NONAME
-	_ZN20CCaLocalizationEntry8SetRowIdEj @ 45 NONAME
-	_ZN20CCaLocalizationEntry9SetTextIdEj @ 46 NONAME
-	_ZN22CCaInnerNotifierFilter11SetParentIdEi @ 47 NONAME
-	_ZN22CCaInnerNotifierFilter12InternalizeLER11RReadStream @ 48 NONAME
-	_ZN22CCaInnerNotifierFilter12SetEntryRoleE10TEntryRole @ 49 NONAME
-	_ZN22CCaInnerNotifierFilter12SetTypeNamesEP16CDesC16ArrayFlat @ 50 NONAME
-	_ZN22CCaInnerNotifierFilter4NewLENS_13TNotifierTypeE @ 51 NONAME
-	_ZN22CCaInnerNotifierFilter5NewLCENS_13TNotifierTypeE @ 52 NONAME
-	_ZN22CCaInnerNotifierFilter7SetIdsLERK6RArrayIiE @ 53 NONAME
-	_ZN23CCaInnerIconDescription10SetSkinIdLERK7TDesC16 @ 54 NONAME
-	_ZN23CCaInnerIconDescription12SetFileNameLERK7TDesC16 @ 55 NONAME
-	_ZN23CCaInnerIconDescription17SetApplicationIdLERK7TDesC16 @ 56 NONAME
-	_ZN23CCaInnerIconDescription4NewLEv @ 57 NONAME
-	_ZN23CCaInnerIconDescription5NewLCEv @ 58 NONAME
-	_ZN23CCaInnerIconDescription5SetIdEi @ 59 NONAME
-	_ZN9MenuUtils8GetTUintERK7TDesC16Rj @ 60 NONAME
-	_ZNK11RCaIdsArray12ExternalizeLER12RWriteStream @ 61 NONAME
-	_ZNK11RCaIdsArray13MarshalDataLCEv @ 62 NONAME
-	_ZNK13CCaInnerEntry12ExternalizeLER12RWriteStream @ 63 NONAME
-	_ZNK13CCaInnerEntry13GetAttributesEv @ 64 NONAME
-	_ZNK13CCaInnerEntry14GetDescriptionEv @ 65 NONAME
-	_ZNK13CCaInnerEntry16GetEntryTypeNameEv @ 66 NONAME
-	_ZNK13CCaInnerEntry4IconEv @ 67 NONAME
-	_ZNK13CCaInnerEntry5GetIdEv @ 68 NONAME
-	_ZNK13CCaInnerEntry6GetUidEv @ 69 NONAME
-	_ZNK13CCaInnerEntry7GetRoleEv @ 70 NONAME
-	_ZNK13CCaInnerEntry7GetTextEv @ 71 NONAME
-	_ZNK13CCaInnerEntry8GetFlagsEv @ 72 NONAME
-	_ZNK13CCaInnerEntry9GetIconIdEv @ 73 NONAME
-	_ZNK13CCaInnerQuery10GetFlagsOnEv @ 74 NONAME
-	_ZNK13CCaInnerQuery11GetFlagsOffEv @ 75 NONAME
-	_ZNK13CCaInnerQuery11GetParentIdEv @ 76 NONAME
-	_ZNK13CCaInnerQuery12ExternalizeLER12RWriteStream @ 77 NONAME
-	_ZNK13CCaInnerQuery13GetAttributesEv @ 78 NONAME
-	_ZNK13CCaInnerQuery17GetEntryTypeNamesEv @ 79 NONAME
-	_ZNK13CCaInnerQuery6GetIdsEv @ 80 NONAME
-	_ZNK13CCaInnerQuery6GetUidEv @ 81 NONAME
-	_ZNK13CCaInnerQuery7GetRoleEv @ 82 NONAME
-	_ZNK13CCaInnerQuery7GetSortEv @ 83 NONAME
-	_ZNK13CCaInnerQuery8GetCountEv @ 84 NONAME
-	_ZNK15RCaEntriesArray12ExternalizeLER12RWriteStream @ 85 NONAME
-	_ZNK20CCaLocalizationEntry11GetStringIdEv @ 86 NONAME
-	_ZNK20CCaLocalizationEntry12GetTableNameEv @ 87 NONAME
-	_ZNK20CCaLocalizationEntry16GetAttributeNameEv @ 88 NONAME
-	_ZNK20CCaLocalizationEntry18GetLocalizedStringEv @ 89 NONAME
-	_ZNK20CCaLocalizationEntry8GetRowIdEv @ 90 NONAME
-	_ZNK20CCaLocalizationEntry9GetTextIdEv @ 91 NONAME
-	_ZNK22CCaInnerNotifierFilter11GetParentIdEv @ 92 NONAME
-	_ZNK22CCaInnerNotifierFilter12ExternalizeLER12RWriteStream @ 93 NONAME
-	_ZNK22CCaInnerNotifierFilter12GetEntryRoleEv @ 94 NONAME
-	_ZNK22CCaInnerNotifierFilter12GetTypeNamesEv @ 95 NONAME
-	_ZNK22CCaInnerNotifierFilter15GetNotifierTypeEv @ 96 NONAME
-	_ZNK22CCaInnerNotifierFilter6GetIdsEv @ 97 NONAME
-	_ZN20CCaLocalizationEntry14SetQmFilenameLERK7TDesC16 @ 98 NONAME
-	_ZNK20CCaLocalizationEntry13GetQmFilenameEv @ 99 NONAME
+	_ZN20CCaLocalizationEntry14SetQmFilenameLERK7TDesC16 @ 41 NONAME
+	_ZN20CCaLocalizationEntry17SetAttributeNameLERK7TDesC16 @ 42 NONAME
+	_ZN20CCaLocalizationEntry19SetLocalizedStringLERK7TDesC16 @ 43 NONAME
+	_ZN20CCaLocalizationEntry4NewLEv @ 44 NONAME
+	_ZN20CCaLocalizationEntry5NewLCEv @ 45 NONAME
+	_ZN20CCaLocalizationEntry8SetRowIdEj @ 46 NONAME
+	_ZN20CCaLocalizationEntry9SetTextIdEj @ 47 NONAME
+	_ZN22CCaInnerNotifierFilter11SetParentIdEi @ 48 NONAME
+	_ZN22CCaInnerNotifierFilter12InternalizeLER11RReadStream @ 49 NONAME
+	_ZN22CCaInnerNotifierFilter12SetEntryRoleE10TEntryRole @ 50 NONAME
+	_ZN22CCaInnerNotifierFilter12SetTypeNamesEP16CDesC16ArrayFlat @ 51 NONAME
+	_ZN22CCaInnerNotifierFilter4NewLENS_13TNotifierTypeE @ 52 NONAME
+	_ZN22CCaInnerNotifierFilter5NewLCENS_13TNotifierTypeE @ 53 NONAME
+	_ZN22CCaInnerNotifierFilter7SetIdsLERK6RArrayIiE @ 54 NONAME
+	_ZN23CCaInnerIconDescription10SetSkinIdLERK7TDesC16 @ 55 NONAME
+	_ZN23CCaInnerIconDescription12SetFileNameLERK7TDesC16 @ 56 NONAME
+	_ZN23CCaInnerIconDescription17SetApplicationIdLERK7TDesC16 @ 57 NONAME
+	_ZN23CCaInnerIconDescription4NewLEv @ 58 NONAME
+	_ZN23CCaInnerIconDescription5NewLCEv @ 59 NONAME
+	_ZN23CCaInnerIconDescription5SetIdEi @ 60 NONAME
+	_ZN9MenuUtils8GetTUintERK7TDesC16Rj @ 61 NONAME
+	_ZNK11RCaIdsArray12ExternalizeLER12RWriteStream @ 62 NONAME
+	_ZNK11RCaIdsArray13MarshalDataLCEv @ 63 NONAME
+	_ZNK13CCaInnerEntry11isLocalizedENS_14TLocalizedTypeE @ 64 NONAME
+	_ZNK13CCaInnerEntry12ExternalizeLER12RWriteStream @ 65 NONAME
+	_ZNK13CCaInnerEntry13GetAttributesEv @ 66 NONAME
+	_ZNK13CCaInnerEntry14GetDescriptionEv @ 67 NONAME
+	_ZNK13CCaInnerEntry16GetEntryTypeNameEv @ 68 NONAME
+	_ZNK13CCaInnerEntry4IconEv @ 69 NONAME
+	_ZNK13CCaInnerEntry5GetIdEv @ 70 NONAME
+	_ZNK13CCaInnerEntry6GetUidEv @ 71 NONAME
+	_ZNK13CCaInnerEntry7GetRoleEv @ 72 NONAME
+	_ZNK13CCaInnerEntry7GetTextEv @ 73 NONAME
+	_ZNK13CCaInnerEntry8GetFlagsEv @ 74 NONAME
+	_ZNK13CCaInnerEntry9GetIconIdEv @ 75 NONAME
+	_ZNK13CCaInnerQuery10GetFlagsOnEv @ 76 NONAME
+	_ZNK13CCaInnerQuery11GetFlagsOffEv @ 77 NONAME
+	_ZNK13CCaInnerQuery11GetParentIdEv @ 78 NONAME
+	_ZNK13CCaInnerQuery12ExternalizeLER12RWriteStream @ 79 NONAME
+	_ZNK13CCaInnerQuery13GetAttributesEv @ 80 NONAME
+	_ZNK13CCaInnerQuery17GetEntryTypeNamesEv @ 81 NONAME
+	_ZNK13CCaInnerQuery6GetIdsEv @ 82 NONAME
+	_ZNK13CCaInnerQuery6GetUidEv @ 83 NONAME
+	_ZNK13CCaInnerQuery7GetRoleEv @ 84 NONAME
+	_ZNK13CCaInnerQuery7GetSortEv @ 85 NONAME
+	_ZNK13CCaInnerQuery8GetCountEv @ 86 NONAME
+	_ZNK15RCaEntriesArray12ExternalizeLER12RWriteStream @ 87 NONAME
+	_ZNK20CCaLocalizationEntry11GetStringIdEv @ 88 NONAME
+	_ZNK20CCaLocalizationEntry12GetTableNameEv @ 89 NONAME
+	_ZNK20CCaLocalizationEntry13GetQmFilenameEv @ 90 NONAME
+	_ZNK20CCaLocalizationEntry16GetAttributeNameEv @ 91 NONAME
+	_ZNK20CCaLocalizationEntry18GetLocalizedStringEv @ 92 NONAME
+	_ZNK20CCaLocalizationEntry8GetRowIdEv @ 93 NONAME
+	_ZNK20CCaLocalizationEntry9GetTextIdEv @ 94 NONAME
+	_ZNK22CCaInnerNotifierFilter11GetParentIdEv @ 95 NONAME
+	_ZNK22CCaInnerNotifierFilter12ExternalizeLER12RWriteStream @ 96 NONAME
+	_ZNK22CCaInnerNotifierFilter12GetEntryRoleEv @ 97 NONAME
+	_ZNK22CCaInnerNotifierFilter12GetTypeNamesEv @ 98 NONAME
+	_ZNK22CCaInnerNotifierFilter15GetNotifierTypeEv @ 99 NONAME
+	_ZNK22CCaInnerNotifierFilter6GetIdsEv @ 100 NONAME