# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813059 -3600
# Node ID d9861ae9169cb64f4914b86e2d22399423722e49
# Parent  77cb48a03620633ee872e93abb7e79e0ed9c8893# Parent  04ca1926b01c3376ef3c91c8dc5062193a06408e
Catchup to latest Symbian^4

diff -r 04ca1926b01c -r d9861ae9169c simpleengine/engine/inc/simplepublisher.h
--- a/simpleengine/engine/inc/simplepublisher.h	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/engine/inc/simplepublisher.h	Thu Jul 22 16:37:39 2010 +0100
@@ -226,7 +226,7 @@
      * Zero length is ignored.
      * @return operation id
      */        
-    TInt CSimplePublisher::DoStartPublishL( MSimpleDocument& aDocument,
+    TInt DoStartPublishL( MSimpleDocument& aDocument,
         TBool aRefresh, const TDesC8& aETag );
 
 
diff -r 04ca1926b01c -r d9861ae9169c simpleengine/presencesettingsapi/group/presencesettingsapi.mmp
--- a/simpleengine/presencesettingsapi/group/presencesettingsapi.mmp	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/presencesettingsapi/group/presencesettingsapi.mmp	Thu Jul 22 16:37:39 2010 +0100
@@ -43,7 +43,7 @@
 LIBRARY                         centralrepository.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwinscw/ 
diff -r 04ca1926b01c -r d9861ae9169c simpleengine/siputils/inc/simplesettings.h
--- a/simpleengine/siputils/inc/simplesettings.h	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/siputils/inc/simplesettings.h	Thu Jul 22 16:37:39 2010 +0100
@@ -120,7 +120,7 @@
      * @param aId key id
      * @return value of the key      
      */
-    TInt TSimpleSettings::GetCenRepIntValueL( 
+    TInt GetCenRepIntValueL( 
         CRepository* aRepository,
         TUint32 aId );
                 
diff -r 04ca1926b01c -r d9861ae9169c simpleengine/xdmrlspres/group/rlspresxdm.mmp
--- a/simpleengine/xdmrlspres/group/rlspresxdm.mmp	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/xdmrlspres/group/rlspresxdm.mmp	Thu Jul 22 16:37:39 2010 +0100
@@ -53,7 +53,7 @@
 LIBRARY                         charconv.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwinscw/ 
diff -r 04ca1926b01c -r d9861ae9169c simpleengine/xmlutils/inc/simpleelement.h
--- a/simpleengine/xmlutils/inc/simpleelement.h	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/xmlutils/inc/simpleelement.h	Thu Jul 22 16:37:39 2010 +0100
@@ -276,7 +276,7 @@
     void ConstructL( const TDesC8& aNsUri,
         const TDesC8& aLocalName );
 
-    void CSimpleElement::ConstructL(
+    void ConstructL(
         CSenElement* aElem,
         TBool aOwn );