# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269890986 -3600
# Node ID 1ac0a0999e8138a2744ca202a9c313866e7c573d
# Parent  7acb7382c3b381beeb671f0a021dc3552e15357a# Parent  148e88b84d9a827c1ad90668deefdbba13fc35eb
Merge.

diff -r 148e88b84d9a -r 1ac0a0999e81 callcontinuity/settingsreader/inc/vccsettingsreader.h
--- a/callcontinuity/settingsreader/inc/vccsettingsreader.h	Mon Mar 29 16:52:39 2010 +0100
+++ b/callcontinuity/settingsreader/inc/vccsettingsreader.h	Mon Mar 29 20:29:46 2010 +0100
@@ -130,7 +130,7 @@
       * @since S60 v3.2
       * @return Service id if entry is found, otherwise KErrNotFound
       */     
-     static TInt VccSettingsReader::VccServiceIdL();
+     static TInt VccServiceIdL();
      
      /**
       * Gets service id that is mapped for the specified VCC call provider 
@@ -141,7 +141,7 @@
       * @since S60 v3.2
       * @return Service id if entry is found, otherwise KErrNotFound
       */     
-     static TInt VccSettingsReader::ServiceIdL( TInt aCallProviderPluginUid );
+     static TInt ServiceIdL( TInt aCallProviderPluginUid );
 private:
 
     /**
diff -r 148e88b84d9a -r 1ac0a0999e81 convergedconnectionhandler/cchserver/inc/cchservicehandler.h
--- a/convergedconnectionhandler/cchserver/inc/cchservicehandler.h	Mon Mar 29 16:52:39 2010 +0100
+++ b/convergedconnectionhandler/cchserver/inc/cchservicehandler.h	Mon Mar 29 20:29:46 2010 +0100
@@ -207,7 +207,7 @@
      * @param aServiceId Service which to be checked
      * @return A state of the service.
      */
-    TCCHSubserviceState CCCHServiceHandler::ServiceState(
+    TCCHSubserviceState ServiceState(
             const TUint aServiceId );
     
     /** 
diff -r 148e88b84d9a -r 1ac0a0999e81 sipvoipprovider/inc/svpcontroller.h
--- a/sipvoipprovider/inc/svpcontroller.h	Mon Mar 29 16:52:39 2010 +0100
+++ b/sipvoipprovider/inc/svpcontroller.h	Mon Mar 29 20:29:46 2010 +0100
@@ -832,8 +832,8 @@
     * @param aNewSVPSession The new established session.
     * @param aOldSVPSession The old transfered session.
     */
-    void CSVPController::CheckCallEventToBeSent( CSVPSessionBase* aNewSVPSession, 
-                                                 CSVPSessionBase* aOldSVPSession ) const;
+    void CheckCallEventToBeSent( CSVPSessionBase* aNewSVPSession, 
+                                 CSVPSessionBase* aOldSVPSession ) const;
 
 private:
 
diff -r 148e88b84d9a -r 1ac0a0999e81 sipvoipprovider/inc/svpdtmfeventgenerator.h
--- a/sipvoipprovider/inc/svpdtmfeventgenerator.h	Mon Mar 29 16:52:39 2010 +0100
+++ b/sipvoipprovider/inc/svpdtmfeventgenerator.h	Mon Mar 29 20:29:46 2010 +0100
@@ -39,7 +39,7 @@
     /**
      * Two-phased constructor.
      */
-    static CSVPDTMFEventGenerator* CSVPDTMFEventGenerator::NewL( MSVPDTMFEventObserver& aObserver );
+    static CSVPDTMFEventGenerator* NewL( MSVPDTMFEventObserver& aObserver );
     
     /**
      * Destructor.
@@ -126,4 +126,4 @@
     
     };
 
-#endif // SVPDTMFEVENTGENERATOR_H
\ No newline at end of file
+#endif // SVPDTMFEVENTGENERATOR_H
diff -r 148e88b84d9a -r 1ac0a0999e81 sipvoipprovider/inc/svpemergencysession.h
--- a/sipvoipprovider/inc/svpemergencysession.h	Mon Mar 29 16:52:39 2010 +0100
+++ b/sipvoipprovider/inc/svpemergencysession.h	Mon Mar 29 20:29:46 2010 +0100
@@ -147,7 +147,7 @@
     * @since Series60 3.2
     * @return ETrue Refenrence to hold controller
     */    
-    CSVPHoldController& CSVPEmergencySession::HoldController() const;
+    CSVPHoldController& HoldController() const;
 
     /**
     * Handles hold session state changes