--- a/cellular/telephonysettings/src/PSetCallDivertingBase.cpp	Tue Feb 02 01:11:09 2010 +0200
+++ b/cellular/telephonysettings/src/PSetCallDivertingBase.cpp	Fri Mar 19 09:40:14 2010 +0200
@@ -17,27 +17,29 @@
 
 
 // INCLUDE FILES
-#include "PSetCallDivertingBasicImpl.h"
+#include "PSetCallDivertingBasicImpl.h" 
 
 #include <badesca.h>
 #include <etelmm.h>           
 #include <e32math.h>
-#include <vmnumber.h>
+// <-- QT PHONE START -->
+//include <vmnumber.h>
+// <-- QT PHONE END -->
 #include <e32svr.h>
 #include <featmgr.h>
 #include <centralrepository.h>
-#include <SettingsInternalCRKeys.h>
+#include <settingsinternalcrkeys.h> 
 
-#include "PsetCallDiverting.h"
-#include "PsetContainer.h"
-#include "MPsetDivertObs.h"
-#include "PsetTelephony.h"
-#include "PSetPanic.h"
-#include "MPsetRequestObs.h"
-#include "PSetUtility.h"
-#include "PhoneSettingsLogger.h"
-#include "PsetSAObserver.h"
-#include "PSetCallDivertingBase.h"
+#include "psetcalldiverting.h" 
+#include "psetcontainer.h" 
+#include "mpsetdivertobs.h" 
+#include "PsetTelephony.h" 
+#include "PSetPanic.h" 
+#include "mpsetrequestobs.h" 
+#include "PSetUtility.h" 
+#include "PhoneSettingsLogger.h" 
+#include "psetsaobserver.h" 
+#include "PSetCallDivertingBase.h" 
 
 //  LOCAL CONSTANTS AND MACROS
 
@@ -167,6 +169,17 @@
     // Empty implementation.
     }
 
+// <-- QT PHONE START -->
+// ---------------------------------------------------------------------------
+// SetRequestObserver
+// ---------------------------------------------------------------------------
+//
+void CPSetCallDivertingBase::SetRequestObserver( MPsetRequestObserver* aObs )
+    {
+    iReqObserver = aObs;
+    }
+// <-- QT PHONE END -->
+
 // ---------------------------------------------------------------------------
 // SetDivertingL
 // ---------------------------------------------------------------------------
@@ -808,12 +821,15 @@
 // Verifies whether the divert-to number is to voice mail box.
 // ---------------------------------------------------------------------------
 //
-TBool CPSetCallDivertingBase::IsVMBXDivertL( TDesC& aTelNumber )
+TBool CPSetCallDivertingBase::IsVMBXDivertL( TDesC& /*aTelNumber*/ )
     {
+
     __PHSLOGSTRING("[PHS]--> CPSetCallDivertingBase::IsVMBXDivertL" );
     
     TBool result = EFalse;
-    
+ // <-- QT PHONE START -->   
+ 
+ /*
     if ( FeatureManager::FeatureSupported ( KFeatureIdVmbxCallDivertIcon ) )
         {
         RVmbxNumber vmbxConnection;
@@ -847,6 +863,8 @@
                 }
             }
         }
+*/
+    // <-- QT PHONE END-->
     __PHSLOGSTRING("[PHS] <--CPSetCallDivertingBase::IsVMBXDivertL" );
     return result;
     }
@@ -854,6 +872,8 @@
 // ---------------------------------------------------------------------------
 // Opens Vmbx. Leaves vmbx to the stack.  
 // ---------------------------------------------------------------------------
+// <-- QT PHONE START-->
+/*
 TInt CPSetCallDivertingBase::OpenVmbxLC( TDes& aTelNumber, RVmbxNumber& aVmbx )
     {
     __PHSLOGSTRING("[PHS]--> CPSetCallDivertingBase::OpenVmbxLC" );
@@ -861,8 +881,10 @@
     CleanupClosePushL( aVmbx );         
     __PHSLOGSTRING("[PHS]<-- CPSetCallDivertingBase::OpenVmbxLC" );
     return aVmbx.GetVmbxNumber( aTelNumber );
+    
     }
-
+*/
+// <-- QT PHONE END-->
 // ---------------------------------------------------------------------------
 // If SsSettings notifies of settings change, copy new value to member variable. 
 // ---------------------------------------------------------------------------