diff -r 2d2d25361590 -r d1838696558c iaupdate/IAD/firmwareupdate/inc/iaupdatefwupdatehandler.h --- a/iaupdate/IAD/firmwareupdate/inc/iaupdatefwupdatehandler.h Tue Sep 28 14:48:39 2010 +0300 +++ b/iaupdate/IAD/firmwareupdate/inc/iaupdatefwupdatehandler.h Thu Oct 14 14:11:30 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -21,11 +21,11 @@ class CIAUpdateFWFotaModel; class CIAUpdateFWSyncAppEngine; +class MIAUpdateFWUpdateObserver; #include - -class CIAUpdateFWUpdateHandler : public CActive +NONSHARABLE_CLASS (CIAUpdateFWUpdateHandler) : public CActive { public: @@ -36,21 +36,13 @@ virtual ~CIAUpdateFWUpdateHandler(); public: - - IMPORT_C void FirmWareUpdatewithNSU(); - IMPORT_C void FirmWareUpdatewithFOTA(); + IMPORT_C void FirmWareUpdatewithFOTA( MIAUpdateFWUpdateObserver* aObserver ); IMPORT_C TBool IsDMSupportAvailableL(); private: - - enum TRequest - { - EFOTA =1, - ENSU - }; - + CIAUpdateFWUpdateHandler(); void ConstructL(); @@ -65,9 +57,9 @@ private: // data - TRequest iRequest; CIAUpdateFWFotaModel* iFotaModel; - CIAUpdateFWSyncAppEngine* iDMEngine; + CIAUpdateFWSyncAppEngine* iFWSyncAppEngine; + MIAUpdateFWUpdateObserver* iObserver; };