diff -r 5cc91383ab1e -r 7333d7932ef7 iaupdate/IAD/firmwareupdate/inc/iaupdatefwsynchandler.h --- a/iaupdate/IAD/firmwareupdate/inc/iaupdatefwsynchandler.h Thu Aug 19 10:02:49 2010 +0300 +++ b/iaupdate/IAD/firmwareupdate/inc/iaupdatefwsynchandler.h Tue Aug 31 15:21:33 2010 +0300 @@ -22,9 +22,8 @@ // INCLUDES #include -#include #include -#include +#include #include "iaupdatefwsyncutil.h" #include "iaupdatefwsyncprofile.h" @@ -47,9 +46,7 @@ NONSHARABLE_CLASS (CIAUpdateFWSyncHandler) : public CBase, public MIAUpdateFWActiveCallerObserver, public MSyncMLEventObserver, - public MSyncMLProgressObserver, - public MProgressDialogCallback - + public MSyncMLProgressObserver { public: /** @@ -275,8 +272,8 @@ private: TUint32 SelectConnectionMethodL(); - TUint32 GetBestIAPInInternetSNAPL( RCmManagerExt& aCmManagerExt ); - TUint32 GetBestIAPInThisSNAPL( RCmManagerExt& aCmManagerExt, TUint32 aSNAPID ); + TUint32 GetBestIAPInInternetSNAPL( RCmManager& aCmManager ); + TUint32 GetBestIAPInThisSNAPL( RCmManager& aCmManager, TUint32 aSNAPID ); private: // session with sync server