diff -r 594d59766373 -r 7d48bed6ce0c cellular/PsetNotesUi/Src/PsuiWaitingObs.cpp --- a/cellular/PsetNotesUi/Src/PsuiWaitingObs.cpp Thu Aug 19 10:28:14 2010 +0300 +++ b/cellular/PsetNotesUi/Src/PsuiWaitingObs.cpp Tue Aug 31 15:45:17 2010 +0300 @@ -17,13 +17,13 @@ // INCLUDE FILES -#include -#include +#include +#include #include -#include "PsuiInternalConstants.h" -#include "PsuiNoteController.h" -#include "PsuiVariationProxy.h" +#include "psuiinternalconstants.h" +#include "psuinotecontroller.h" +#include "psuivariationproxy.h" // MEMBER FUNCTIONS // --------------------------------------------------------------------------- @@ -110,7 +110,7 @@ TUint8 aBsc[KPSUIMaxBscNumber] ) { - if ( iCallWaitingDistinguishEnabled && aStatus == MPsetCallWaiting::EStatusNotProvisioned ) + if ( iCallWaitingDistinguishEnabled && aStatus == MPsetCallWaiting::EStatusNotProvisioned ) { CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, R_CW_NOT_PROVISIONED_NOTE ); @@ -123,30 +123,30 @@ else { if( iCallWaitingDistinguishEnabled ) - { - - //show only "CW active" even if the bsc list is present. - //This change is to fix the error ENYI-6DYFKZ - CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, + { + + //show only "CW active" even if the bsc list is present. + //This change is to fix the error ENYI-6DYFKZ + CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, R_CW_ACTIVE_NO_BSC_NOTE ); - } + } else - { - - //if no bsc-list present, show only "CW active" - if ( aBsc[0] == KPSUINoBscGroup ) - { - CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, + { + + //if no bsc-list present, show only "CW active" + if ( aBsc[0] == KPSUINoBscGroup ) + { + CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, R_CW_ACTIVE_NO_BSC_NOTE ); - } - else - { + } + else + { - CPsuiNoteController::InstanceL()->ShowBscListL( + CPsuiNoteController::InstanceL()->ShowBscListL( R_CW_STATUS_HEADING, aBsc ); - } - } + } + } } }