diff -r 924385140d98 -r c2c61fdca848 coreapplicationuis/Rfs/inc/rfsConnectionObserver.h --- a/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h Tue Aug 31 15:24:25 2010 +0300 +++ b/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h Wed Sep 01 12:24:48 2010 +0100 @@ -19,14 +19,14 @@ #ifndef __RFSPDPOBSERVER_H #define __RFSPDPOBSERVER_H -#include +#include // P&S KEYS FROM SIP & PDP CONNECTION #include #include #include -#include "rfscontimer.h" +#include "rfsConTimer.h" class CRfsConTimer; @@ -36,7 +36,7 @@ EPdpConnectionClose // this should be the last enum }; -NONSHARABLE_CLASS( CRfsConnectionObserver ): public CActive,public MHbDeviceProgressDialogObserver +NONSHARABLE_CLASS( CRfsConnectionObserver ): public CActive { public: @@ -49,11 +49,6 @@ * Destructor */ virtual ~CRfsConnectionObserver(); - - void ProgressDialogCancelled(const CHbDeviceProgressDialogSymbian* iDialog); - - void ProgressDialogClosed(const CHbDeviceProgressDialogSymbian * iDialog) ; - public: /** @@ -140,8 +135,9 @@ /** * Own: Wait dialog */ - CHbDeviceProgressDialogSymbian* iDialog ; - /** + CAknWaitDialog* iWaitDialog; + + /** * Own: PDP property */ RProperty iPDPProperty; @@ -177,8 +173,6 @@ TBool iIsSipInformedForClosingAllConnection; TBool iIsPDPInformedforClosingAllConnection; TBool iIsClosingConnectionsApplicable; - //for synchronous dialog handling - CActiveSchedulerWait *iWait; public: