--- a/XDMSettingsUI/inc/XDMPluginContainer.h	Fri Jun 11 16:25:22 2010 +0100
+++ b/XDMSettingsUI/inc/XDMPluginContainer.h	Tue Jun 15 11:47:47 2010 +0100
@@ -177,7 +177,7 @@
         * Get the Setting ID of the current set
         * @return TInt setting ID of the current set
         */
-      TInt CXDMPluginContainer::GetCurrentSetIdL();
+      TInt GetCurrentSetIdL();
       
         /**
         * Load XDM Collection names with trap, useful when list doesnt have anything

--- a/simpleengine/engine/inc/simplepublisher.h	Fri Jun 11 16:25:22 2010 +0100
+++ b/simpleengine/engine/inc/simplepublisher.h	Tue Jun 15 11:47:47 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 );
 
 

--- a/simpleengine/siputils/inc/simplesettings.h	Fri Jun 11 16:25:22 2010 +0100
+++ b/simpleengine/siputils/inc/simplesettings.h	Tue Jun 15 11:47:47 2010 +0100
@@ -120,7 +120,7 @@
      * @param aId key id
      * @return value of the key      
      */
-    TInt TSimpleSettings::GetCenRepIntValueL( 
+    TInt GetCenRepIntValueL( 
         CRepository* aRepository,
         TUint32 aId );
                 

--- a/simpleengine/xmlutils/inc/simpleelement.h	Fri Jun 11 16:25:22 2010 +0100
+++ b/simpleengine/xmlutils/inc/simpleelement.h	Tue Jun 15 11:47:47 2010 +0100
@@ -276,7 +276,7 @@
     void ConstructL( const TDesC8& aNsUri,
         const TDesC8& aLocalName );
 
-    void CSimpleElement::ConstructL(
+    void ConstructL(
         CSenElement* aElem,
         TBool aOwn );
 

--- a/xdmprotocols/XcapProtocol/XcapHttpTransport/inc/XcapHttpResponse.h	Fri Jun 11 16:25:22 2010 +0100
+++ b/xdmprotocols/XcapProtocol/XcapHttpTransport/inc/XcapHttpResponse.h	Tue Jun 15 11:47:47 2010 +0100
@@ -39,7 +39,7 @@
         * A global logging function for 16 bit data.
         * @param aCommand command to be handled
         */
-        static CXcapHttpResponse* CXcapHttpResponse::NewL( CXcapHttpRequest* aHttpRequest,
+        static CXcapHttpResponse* NewL( CXcapHttpRequest* aHttpRequest,
                                                            CXcapHttpTransport& aTransportMain );
         
         /**

--- a/xdmprotocols/XcapProtocol/XcapHttpTransport/src/XcapHttpAuthManager.cpp	Fri Jun 11 16:25:22 2010 +0100
+++ b/xdmprotocols/XcapProtocol/XcapHttpTransport/src/XcapHttpAuthManager.cpp	Tue Jun 15 11:47:47 2010 +0100
@@ -223,11 +223,13 @@
     switch( aName )
         {                                              
         case ENfoNextnonce:
+            {
             SetNextNonceL( value );
             #ifdef _DEBUG
                 TPtrC8 nonce( iServerNonce->Des() );
                 iTransportMain.WriteToLog( _L8( "  -> Nonce set to %S" ), &nonce );
             #endif
+            }
             break;
         case ENfoRspauth:
             /* TODO */

--- a/xdmprotocols/XcapProtocol/XcapUtils/inc/XcapEarlyIms.h	Fri Jun 11 16:25:22 2010 +0100
+++ b/xdmprotocols/XcapProtocol/XcapUtils/inc/XcapEarlyIms.h	Tue Jun 15 11:47:47 2010 +0100
@@ -72,7 +72,7 @@
         * Clean the log file
         * @return void
         */
-        void CXcapEarlyIms::DeleteLogFileL();
+        void DeleteLogFileL();
         
         /**
         * A global logging function for 8 bit data.