--- a/webservices/idwsfplugin/inc/idwsfdiscoveryserviceclient.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/idwsfplugin/inc/idwsfdiscoveryserviceclient.h	Sun Mar 28 16:38:33 2010 +0100
@@ -105,7 +105,7 @@
         
     private: // New functions
     
-        HBufC8* CIdWsfDiscoveryServiceClient::DsLookupRequestL(MSenServiceDescription& aPattern);
+        HBufC8* DsLookupRequestL(MSenServiceDescription& aPattern);
         
         CIdWsfDsQueryResponse* ParseResponseLC(TDesC8& aMessage);
         //void SetStatusL(TInt aStatus);

--- a/webservices/wscore/inc/senxmldao.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wscore/inc/senxmldao.h	Sun Mar 28 16:38:33 2010 +0100
@@ -125,8 +125,8 @@
         const TDesC8& ProxyHost();
         CDesC8Array& SupportedFrameworksL();
 
-        MSIF* CSenXMLDAO::DefaultFrameworkL(const TDesC8& aFrameworkID, 
-                                            const TDesC8& aCue);
+        MSIF* DefaultFrameworkL(const TDesC8& aFrameworkID, 
+                                const TDesC8& aCue);
 
         TBool Owns(CSenWSDescription* aSD);
 

--- a/webservices/wscredentialmanager/inc/seninternalcredential.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wscredentialmanager/inc/seninternalcredential.h	Sun Mar 28 16:38:33 2010 +0100
@@ -238,7 +238,7 @@
         * @return   ETrue, if Credential has properties or
         *           EFalse, if Credential does not have properties
         */
-        IMPORT_C TBool CSenInternalCredential::HasProperties();
+        IMPORT_C TBool HasProperties();
 
         /**
         * Method for setting IdentityProviderId for this Credential.

--- a/webservices/wsframework/inc/seninternalserviceconsumer.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wsframework/inc/seninternalserviceconsumer.h	Sun Mar 28 16:38:33 2010 +0100
@@ -76,7 +76,7 @@
 
         IMPORT_C virtual void SetStatusL(const TInt aStatus);
 
-        IMPORT_C CSenIdentifier& CSenInternalServiceConsumer::Identifier() const;
+        IMPORT_C CSenIdentifier& Identifier() const;
 
         IMPORT_C TInt ChunkByTxnIdL(TInt aTxnId, CSenChunk*& aChunk);
 

--- a/webservices/wsframework/inc/sensyncrequester.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wsframework/inc/sensyncrequester.h	Sun Mar 28 16:38:33 2010 +0100
@@ -153,7 +153,7 @@
          virtual MSenTransport& TransportL();
          virtual CSenIdentifier& Identifier() const;  
          virtual TInt ChunkByTxnIdL(TInt aTxnId, CSenChunk*& aChunk);
-         virtual MSenRemoteHostlet* CSenSyncRequester::Hostlet() const;
+         virtual MSenRemoteHostlet* Hostlet() const;
 
          virtual TInt SendToHostletL(MSenRemoteHostlet& aReceiver,
                                      const TDesC8& aMessage,

--- a/webservices/wshostlettransportplugin/inc/senhostlettransportplugin.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wshostlettransportplugin/inc/senhostlettransportplugin.h	Sun Mar 28 16:38:33 2010 +0100
@@ -91,7 +91,7 @@
         virtual TInt PropertiesL(HBufC8*& aProperties);
         virtual TInt CompleteTransaction(const TInt aTxnId, const TInt aStatus = KErrNone);
         virtual TInt CancelTransaction(const TInt aTxnId);
-        virtual TPtrC8 CSenHostletTransportPlugin::UriSchemeL();
+        virtual TPtrC8 UriSchemeL();
         
         virtual MSenProperties& PropertiesL();
         
@@ -169,7 +169,7 @@
                                  MSenTransport& aParent,
                                  MSenTransportContext& aParentCtx);
 
-        CSenChunk* CSenActiveHostletRequest::FindChunkL(const TInt aTxnId, TInt& aIndex) ;                      
+        CSenChunk* FindChunkL(const TInt aTxnId, TInt& aIndex) ;                      
 
         CSenTransportProperties* NewPropertiesByTypeL( MSenProperties::TSenPropertiesClassType aType, const TDesC8& aPropertiesAsXml );
 

--- a/webservices/wslocaltransportplugin/inc/senlocaltransportplugin.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wslocaltransportplugin/inc/senlocaltransportplugin.h	Sun Mar 28 16:38:33 2010 +0100
@@ -86,7 +86,7 @@
         virtual TInt PropertiesL(HBufC8*& aProperties);
         virtual TInt CompleteTransaction(const TInt aTxnId, const TInt aStatus);
         virtual TInt CancelTransaction(const TInt aTxnId);
-        virtual TPtrC8 CSenLocalTransportPlugin::UriSchemeL();
+        virtual TPtrC8 UriSchemeL();
 
         virtual MSenProperties& PropertiesL();
         

--- a/webservices/wsmessages/inc/sensoapmessagedom2.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wsmessages/inc/sensoapmessagedom2.h	Sun Mar 28 16:38:33 2010 +0100
@@ -134,7 +134,7 @@
         /**
          *  C++ default constructor.
          */
-        IMPORT_C CSenSoapMessageDom2::CSenSoapMessageDom2();
+        IMPORT_C CSenSoapMessageDom2();
 
         IMPORT_C CSenFragmentBase* CreateBodyFragmentL(const TDesC8& aNsUri,
                                                        const TDesC8& aLocalName,

--- a/webservices/wsoviplugin/inc/wsovimessagecontext.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wsoviplugin/inc/wsovimessagecontext.h	Sun Mar 28 16:38:33 2010 +0100
@@ -99,7 +99,7 @@
         virtual TInt Add(const TDesC8& aKey, MSenMessage* apMessage, TBool aOwned = ETrue);
         virtual TInt Update(const TDesC8& aKey, MSenMessage* apMessage, TBool aOwned = ETrue);
         virtual MSenMessage* GetMessageL(const TDesC8& aKey);
-        virtual CSenChunk* CWSOviMessageContext::ChunkL();
+        virtual CSenChunk* ChunkL();
         virtual TInt SetChunk(CSenChunk* apMsgAsChunk, TBool aOwned = ETrue);
         virtual TInt SetDirection(SenContext::TContextDirection aDirection);
         

--- a/webservices/wsstar/wsstarplugin/inc/wsstarmessagecontext.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/webservices/wsstar/wsstarplugin/inc/wsstarmessagecontext.h	Sun Mar 28 16:38:33 2010 +0100
@@ -108,7 +108,7 @@
         virtual TInt Add(const TDesC8& aKey, MSenMessage* apMessage, TBool aOwned = ETrue);
         virtual TInt Update(const TDesC8& aKey, MSenMessage* apMessage, TBool aOwned = ETrue);
         virtual MSenMessage* GetMessageL(const TDesC8& aKey);// codescannerwarnings
-        virtual CSenChunk* CWSStarMessageContext::ChunkL(); // codescannerwarnings
+        virtual CSenChunk* ChunkL(); // codescannerwarnings
         virtual TInt SetChunk(CSenChunk* apMsgAsChunk, TBool aOwned = ETrue); // not implemented
         virtual TInt SetDirection(SenContext::TContextDirection aDirection); // not implemented
         

--- a/websrv_pub/web_service_connection_api/inc/SenSoapMessage.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/websrv_pub/web_service_connection_api/inc/SenSoapMessage.h	Sun Mar 28 16:38:33 2010 +0100
@@ -96,7 +96,7 @@
         /**
          *    C++ default constructor.
          */
-        IMPORT_C CSenSoapMessage::CSenSoapMessage();
+        IMPORT_C CSenSoapMessage();
 
         // New functions
         

--- a/websrv_pub/web_service_description_api/inc/SenXmlServiceDescription.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/websrv_pub/web_service_description_api/inc/SenXmlServiceDescription.h	Sun Mar 28 16:38:33 2010 +0100
@@ -530,7 +530,7 @@
         *         of retry attempts (each showing a dialog) is service invocation
         *         framework spesific; typically 3 retries are permitted.     
         */
-        IMPORT_C void CSenXmlServiceDescription::SetPromptUserInfoL( TBool aPromptUserInfoMode );
+        IMPORT_C void SetPromptUserInfoL( TBool aPromptUserInfoMode );
 
         /**
         * Getter for current userinfo mode (KSenAttrPromptUserInfo attribute).

--- a/websrv_pub/web_service_messaging_api/inc/SenSoapMessage2.h	Sun Mar 14 13:13:53 2010 +0000
+++ b/websrv_pub/web_service_messaging_api/inc/SenSoapMessage2.h	Sun Mar 28 16:38:33 2010 +0100
@@ -157,7 +157,7 @@
         /**
          *  C++ default constructor.
          */
-        IMPORT_C CSenSoapMessage2::CSenSoapMessage2();
+        IMPORT_C CSenSoapMessage2();
 
         // New functions