--- a/cellular/telephonysettings/src/PSetCallDivertingBasicImpl.cpp Tue Aug 31 15:45:17 2010 +0300
+++ b/cellular/telephonysettings/src/PSetCallDivertingBasicImpl.cpp Wed Sep 01 12:15:03 2010 +0100
@@ -17,25 +17,26 @@
// INCLUDE FILES
-#include "psetcalldivertingbasicimpl.h"
+#include "PSetCallDivertingBasicImpl.h"
#include <badesca.h>
#include <etelmm.h>
#include <e32math.h>
+#include <vmnumber.h>
#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 "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"
// LOCAL CONSTANTS AND MACROS
_LIT( KPSetIntNbr, "+" );
@@ -66,7 +67,6 @@
//
CPSetCallDivertingBasicImpl::~CPSetCallDivertingBasicImpl()
{
- Cancel();
}
// -----------------------------------------------------------------------------
@@ -105,7 +105,6 @@
User::Leave( KErrInUse );
}
iBsc = aBsc;
- iRequestedServiceGroup = aDivert.iServiceGroup;
CPsetTelephony::CheckLineModeL( aDivert.iServiceGroup, &iPhone, iLine );
if ( !iLine->SubSessionHandle() )
@@ -204,10 +203,6 @@
__PHSLOGSTRING("[PHS]--> CPSetCallDivertingBasicImpl::RunL: EPSetChangeDivert" );
//Notify Observer
iDivertStatus.iStatus = PSetUtility::GetChangeInfoStatus( iChangeInfo.iAction );
- iDivertStatus.iNumber = iChangeInfo.iNumber.iTelNumber;
- iDivertStatus.iCondition = PSetUtility::GetDivertReason(iReason);
- iDivertStatus.iNoReplyTimer = iChangeInfo.iTimeout;
- iDivertStatus.iServiceGroup = iRequestedServiceGroup;
// Check is done because of VOIP notification functionality(PSetNotesUI).
if ( iVoiceDivert && !iVideoDivert )