diff -r ff3b6d0fd310 -r ae8abd0db65c cellular/telephonysettings/src/PsetCallWaiting.cpp
--- a/cellular/telephonysettings/src/PsetCallWaiting.cpp	Tue Feb 02 01:11:09 2010 +0200
+++ b/cellular/telephonysettings/src/PsetCallWaiting.cpp	Fri Mar 19 09:40:14 2010 +0200
@@ -18,17 +18,17 @@
 
 
 //  Include Files
-#include "PsetCallWaiting.h"
-#include "MPsetCallWaitingObs.h"
+#include "psetcallwaiting.h" 
+#include "mpsetcallwaitingobs.h" 
 #include "nwdefs.h"             
-#include "PSetPanic.h"          
-#include "PsetConstants.h"      
-#include "MPsetRequestObs.h"
-#include "PSetUtility.h"
-#include "PhoneSettingsLogger.h"
+#include "PSetPanic.h" 
+#include "psetconstants.h" 
+#include "mpsetrequestobs.h" 
+#include "PSetUtility.h" 
+#include "PhoneSettingsLogger.h" 
 
-#include "PsetVariationProxy.h"
-#include <settingsinternalcrkeys.h>
+#include "PsetVariationProxy.h" 
+#include <settingsinternalcrkeys.h> 
 
 // CONSTANTS    
 _LIT( KPSNameOfClass, "CPsetCallWaiting" );
@@ -107,14 +107,14 @@
     Cancel();
     iReqObserver = NULL;
 
-	if ( iSsSettings )
+    if ( iSsSettings )
         {
         iSsSettings->Cancel( ESSSettingsAls, *this ); 
         iSsSettings->Close();
         }
     delete iSsSettings;
     iSsSettings = NULL;
-	
+    
     delete iCwInterrogator;
     iCwInterrogator = NULL;
     }
@@ -125,14 +125,14 @@
 // 
 // ---------------------------------------------------------------------------
 void CPsetCallWaiting::PhoneSettingChanged( TSSSettingsSetting aSetting, TInt aNewValue )
-	{
-	__PHSLOGSTRING("[PHS]--> PhoneSettingChanged::ValidateBsc" );
-	if ( aSetting == ESSSettingsAls )
+    {
+    __PHSLOGSTRING("[PHS]--> PhoneSettingChanged::ValidateBsc" );
+    if ( aSetting == ESSSettingsAls )
         {
         iAls = static_cast <TSSSettingsAlsValue> (aNewValue);
         }
     __PHSLOGSTRING("[PHS] <--PhoneSettingChanged::ValidateBsc" );
-	}
+    }
 
 // ---------------------------------------------------------------------------
 // 
@@ -193,14 +193,14 @@
     
     RMobilePhone::TMobileService cwBasicServiceGroup;
 
-	ValidateBsc( aBsc );
+    ValidateBsc( aBsc );
 
     if ( aBsc == EAltTele )
         {
         cwBasicServiceGroup = PSetUtility::VerifyAltLineUseL();
         }
 
-	cwBasicServiceGroup = PSetUtility::ChangeToEtelInternal( aBsc );
+    cwBasicServiceGroup = PSetUtility::ChangeToEtelInternal( aBsc );
 
     if ( aSetting == EActivateCallWaiting )
         {
@@ -272,8 +272,8 @@
     // even though request is not active.
     iObserver->SetEngineContact( *this );
     // Does not leave
-	TRAPD( err, iObserver->HandleCWRequestingL( EFalse, ETrue ) );
-	
+    TRAPD( err, iObserver->HandleCWRequestingL( EFalse, ETrue ) );
+    
     if ( !IsActive() || err != KErrNone )
         {
         return KErrGeneral;
@@ -347,25 +347,25 @@
                     // pass on the status if the current status is still 
                     // unknown and the received status is not unknown
                     switch ( cwInfo.iStatus )
-                    	{
-                    	case RMobilePhone::ECallWaitingStatusNotProvisioned:
-                    		{
-                    		status = EStatusNotProvisioned;
-                    		break;
-                    		}	
-                    		
-                    		case RMobilePhone::ECallWaitingStatusNotAvailable:
-                    		{		
-                    		status = EStatusNotAvailable;
-                    		break;
-                    		}
-                    		
-                    		default:
-                    		{	
-                    		status = TGetCallWaitingStatus( cwInfo.iStatus );
-                    		break;		
-                    		}
-                    	}
+                        {
+                        case RMobilePhone::ECallWaitingStatusNotProvisioned:
+                            {
+                            status = EStatusNotProvisioned;
+                            break;
+                            }   
+                            
+                            case RMobilePhone::ECallWaitingStatusNotAvailable:
+                            {       
+                            status = EStatusNotAvailable;
+                            break;
+                            }
+                            
+                            default:
+                            {   
+                            status = TGetCallWaitingStatus( cwInfo.iStatus );
+                            break;      
+                            }
+                        }
                     }
                     
                 arrayOfBsc[i] = static_cast <TUint8>