diff -r 7d48bed6ce0c -r 987c9837762f cellular/telephonysettings/inc/PSetCallDivertingBase.h --- a/cellular/telephonysettings/inc/PSetCallDivertingBase.h Tue Aug 31 15:45:17 2010 +0300 +++ b/cellular/telephonysettings/inc/PSetCallDivertingBase.h Wed Sep 01 12:15:03 2010 +0100 @@ -24,10 +24,10 @@ #include #include #include -#include "mcalldiverting.h" -#include "msssettingsobserver.h" +#include "MCallDiverting.h" +#include "MSSSettingsObserver.h" #include "nwdefs.h" -#include "psetconstants.h" +#include "PsetConstants.h" // CLASS DECLARATION class MPsetDivertObserver; @@ -66,11 +66,7 @@ ~CPSetCallDivertingBase(); public: // From base class. - /** - * @see MCallDiverting. - */ - void SetRequestObserver( MPsetRequestObserver* aObs ); - + /** * @see MCallDiverting. */ @@ -115,6 +111,11 @@ /** * @see MCallDiverting. + */ + TInt OpenVmbxLC( TDes& aTelNumber, RVmbxNumber& aVmbx ); + + /** + * @see MCallDiverting. */ TInt GetNumbersFromSharedDataL( TInt aType, CDesC16ArrayFlat& aArray ); @@ -243,12 +244,12 @@ /** * @see CActive::RunL(). */ - virtual void RunL(); + void RunL(); /** * @see CActive::DoCancel(). */ - virtual void DoCancel(); + void DoCancel(); /** * @see MSSSettingsObserver::PhoneSettingChanged().