diff -r bab96b7ed1a4 -r f39ed5e045e0 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp	Tue Jun 15 14:14:38 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp	Thu Jul 22 16:33:21 2010 +0100
@@ -1,4 +1,4 @@
-/* 
+/*
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
@@ -55,13 +55,35 @@
 // CpSettingsWrapper::setShowCallDuration
 // -----------------------------------------------------------------------------
 //
-int CpSettingsWrapper::setShowCallDuration( bool value )
+int CpSettingsWrapper::setShowCallDuration( 
+        bool value )
     {
     SMC_MOCK_METHOD1( int, bool, value )
     }
 
 
 // -----------------------------------------------------------------------------
+// CpSettingsWrapper::readVtVideoSending
+// -----------------------------------------------------------------------------
+//
+int CpSettingsWrapper::readVtVideoSending(  )
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpSettingsWrapper::writeVtVideoSending
+// -----------------------------------------------------------------------------
+//
+int CpSettingsWrapper::writeVtVideoSending( 
+        int value )
+    {
+    SMC_MOCK_METHOD1( int, int, value )
+    }
+
+
+// -----------------------------------------------------------------------------
 // CpSettingsWrapper::readSoftRejectText
 // -----------------------------------------------------------------------------
 //
@@ -75,7 +97,8 @@
         userDefined = true;
         i=1;
     }
-    SMC_MOCK_METHOD2( void, QString &, text, bool, userDefined )
+    SMC_MOCK_METHOD2( void, QString &, text,
+        bool &, userDefined )
     }
 
 
@@ -84,9 +107,11 @@
 // -----------------------------------------------------------------------------
 //
 int CpSettingsWrapper::writeSoftRejectText( 
-        const QString & text, bool userDefined )
+        const QString & text,
+        bool userDefined )
     {
-    SMC_MOCK_METHOD2( int, const QString &, text, bool, userDefined )
+    SMC_MOCK_METHOD2( int, const QString &, text, 
+        bool, userDefined )
     }
 
 
@@ -104,19 +129,40 @@
 // CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled
 // -----------------------------------------------------------------------------
 //
-bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled()
-{
+bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(  )
+    {
     SMC_MOCK_METHOD0( bool )
-}
+    }
+
 
 // -----------------------------------------------------------------------------
 // CpSettingsWrapper::isPhoneOffline
 // -----------------------------------------------------------------------------
 //
-bool CpSettingsWrapper::isPhoneOffline() const
-{
+bool CpSettingsWrapper::isPhoneOffline(  ) const
+    {
     SMC_MOCK_METHOD0( bool )
-}
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpSettingsWrapper::isOngoingCall
+// -----------------------------------------------------------------------------
+//
+bool CpSettingsWrapper::isOngoingCall(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpSettingsWrapper::forbiddenIconSupported
+// -----------------------------------------------------------------------------
+//
+bool CpSettingsWrapper::forbiddenIconSupported(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
 
 
 // -----------------------------------------------------------------------------
@@ -138,12 +184,17 @@
     SMC_MOCK_METHOD0( bool )
     }
 
+
 // -----------------------------------------------------------------------------
 // Tools::errorCodeTextMapping
 // -----------------------------------------------------------------------------
 //
-bool Tools::errorCodeTextMapping( const int errorcode, QString & errorText )
+bool Tools::errorCodeTextMapping( 
+        const int errorcode,
+        QString & errorText )
     {
-    SMC_MOCK_METHOD2( bool, int, errorcode, QString &, errorText )
+    SMC_MOCK_METHOD2( bool, const int, errorcode, 
+        QString &, errorText )
     }
-	
+
+