# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279812646 -3600
# Node ID e32446434994b7a6f8e657c6f8e80ba0ab3320b4
# Parent  0e4955de0cea17a32c6256b0b8850acf2208ce6b# Parent  9ba7f05d28a588946919558cb16f7e7722712694
Catchup to latest Symbian^4

diff -r 9ba7f05d28a5 -r e32446434994 connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp
--- a/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -31,7 +31,7 @@
 
 TARGETPATH      sys/bin
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE	./def/eabiu
 #elif defined(WINSCW) 
 DEFFILE	./def/bwinscw
diff -r 9ba7f05d28a5 -r e32446434994 connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp
--- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -29,7 +29,7 @@
 
 UID             0x10009d8d 0x101F99F8
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE	./def/eabiu
 #elif defined(WINSCW) 
 DEFFILE	./def/bwinscw
diff -r 9ba7f05d28a5 -r e32446434994 connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp
--- a/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -30,7 +30,7 @@
 TARGETTYPE      DLL
 UID             0x10009D8D 0x101F9698
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE	./def/eabiu
 #elif defined(WINSCW) 
 DEFFILE	./def/bwinscw
diff -r 9ba7f05d28a5 -r e32446434994 connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp
--- a/connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -28,7 +28,7 @@
 
 UID             0x10009D8D 0x101F968A
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE ./def/eabiu
 #elif defined(WINSCW)
 DEFFILE ./def/bwinscw
diff -r 9ba7f05d28a5 -r e32446434994 connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp
--- a/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -30,7 +30,7 @@
 TARGETTYPE      DLL
 UID             0x10009D8D 0x101F968B
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE	./def/eabiu
 #elif defined(WINSCW) 
 DEFFILE	./def/bwinscw
diff -r 9ba7f05d28a5 -r e32446434994 connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp
--- a/connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp	Tue Jul 06 14:06:02 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp	Thu Jul 22 16:30:46 2010 +0100
@@ -1039,7 +1039,7 @@
                 }
 		    }
 		}
-	_LIT(KFormat, "%.0f°%.0f'%.2f\"" );
+	_LIT(KFormat, "%.0f\xB0%.0f'%.2f\"" );
 	aPosDegrees.Format( KFormat, degrees, minutes, seconds );
 	TRACE_FUNC_EXIT;
 	return KErrNone;
diff -r 9ba7f05d28a5 -r e32446434994 connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp
--- a/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -27,7 +27,7 @@
 TARGETTYPE      DLL
 UID             0x10009D8D 0x101F99FA
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE	./def/eabi
 #elif defined(WINSCW) 
 DEFFILE	./def/bwinscw
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp
--- a/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY	CAP_ECOM_PLUGIN
 VENDORID	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabinsmlagendadataprovider
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwnsmlagendadataprovider
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp
--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Thu Jul 22 16:30:46 2010 +0100
@@ -61,7 +61,7 @@
 // -----------------------------------------------------------------------------
 //
 CNSmlAgendaDataStore::CNSmlAgendaDataStore() :
-	iKey( TKeyArrayFix( _FOFF( TNSmlSnapshotItem, ItemId() ), ECmpTInt ) ),
+	iKey( TKeyArrayFix( _FOFF_DYNAMIC( TNSmlSnapshotItem, ItemId() ), ECmpTInt ) ),
 	iPos( -1 ),
 	iHasHistory( EFalse ),
 	iModificationCount( KNSmlCompactAfterChanges ),
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp
--- a/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -27,7 +27,7 @@
 UID             0x10009D8D 0x101F6DDD
 VENDORID		VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabicontactsdataprovider
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwcontactsdataprovider
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp
--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp	Thu Jul 22 16:30:46 2010 +0100
@@ -81,7 +81,7 @@
 // ----------------------------------------------------------------------------
 // CNSmlContactsDataStore::CNSmlContactsDataStore() 
 // ----------------------------------------------------------------------------
-EXPORT_C CNSmlContactsDataStore::CNSmlContactsDataStore() : iKey( TKeyArrayFix( _FOFF( TNSmlSnapshotItem,ItemId() ),ECmpTInt ))
+EXPORT_C CNSmlContactsDataStore::CNSmlContactsDataStore() : iKey( TKeyArrayFix( _FOFF_DYNAMIC( TNSmlSnapshotItem,ItemId() ),ECmpTInt ))
 	{
 	_DBG_FILE("CNSmlContactsDataStore::CNSmlContactsDataStore(): begin");
 	iSyncHistory = EFalse;
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp
--- a/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -27,7 +27,7 @@
 UID             0x10009D8D 0x101F8612
 VENDORID		VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabinotepaddataprovider
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwnotepaddataprovider
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp
--- a/omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp	Thu Jul 22 16:30:46 2010 +0100
@@ -126,7 +126,7 @@
 // ----------------------------------------------------------------------------
 // CNSmlNotepadDataStore::CNSmlNotepadDataStore() 
 // ----------------------------------------------------------------------------
-CNSmlNotepadDataStore::CNSmlNotepadDataStore() : iOpenedStoreId(KNSmlNotepadAdapterImplUid),iKey( TKeyArrayFix( _FOFF( TNSmlSnapshotItem,ItemId() ),ECmpTInt ))
+CNSmlNotepadDataStore::CNSmlNotepadDataStore() : iOpenedStoreId(KNSmlNotepadAdapterImplUid),iKey( TKeyArrayFix( _FOFF_DYNAMIC( TNSmlSnapshotItem,ItemId() ),ECmpTInt ))
 	{
 	_NOTEPAD_DBG_FILE("CNSmlNotepadDataStore::CNSmlNotepadDataStore(): begin");
 	iSyncHistory = EFalse;
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/datamod/bld/nsmldatamod.mmp
--- a/omads/omadsextensions/datamod/bld/nsmldatamod.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/datamod/bld/nsmldatamod.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -25,7 +25,7 @@
 CAPABILITY 		CAP_GENERAL_DLL
 VENDORID		VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE			./def/eabidatamod
 #elif defined(WINSCW)
 DEFFILE			./def/bwinscwdatamod
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp
--- a/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp	Thu Jul 22 16:30:46 2010 +0100
@@ -26,7 +26,7 @@
 VENDORID 	VID_DEFAULT
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabicgiscriptparser
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwcgiscriptparser
diff -r 9ba7f05d28a5 -r e32446434994 omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro
--- a/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro	Thu Jul 22 16:30:46 2010 +0100
@@ -44,7 +44,7 @@
 		
 		
 defBlock = \
- "$${LITERAL_HASH}if defined(ARMCC)" \
+ "$${LITERAL_HASH}if defined(EABI)" \
  "DEFFILE ./def/eabicontactsdatastoreextension" \
  "$${LITERAL_HASH}elif defined(WINSCW)" \
  "DEFFILE ./def/bwinscwcontactsdatastoreextension" \