--- a/iaupdate/IAD/ui/inc/iaupdateuicontroller.h	Tue Aug 31 15:21:33 2010 +0300
+++ b/iaupdate/IAD/ui/inc/iaupdateuicontroller.h	Wed Sep 01 12:22:02 2010 +0100
@@ -28,7 +28,6 @@
 #include "iaupdatecontrollerobserver.h"
 #include "iaupdatenodeobserver.h"
 #include "iaupdatewaitdialogobserver.h"
-#include "iaupdatedialogobserver.h"
 #include "iaupdatestarterobserver.h"
 #include "iaupdateroaminghandlerobserver.h"
 #include "iaupdaterefreshobserver.h"
@@ -48,13 +47,7 @@
 class MIAUpdateUiControllerObserver;
 class MIAUpdateHistory;
 class MIAUpdateFwNode;
-class IAUpdateWaitDialog;
-class IAUpdateDialogUtil;
-
-class QString;
 class CIAUpdateNodeId;
-class CEikonEnv;
-class HbAction;
 
 
 // CLASS DECLARATION
@@ -69,8 +62,7 @@
     public MIAUpdateWaitDialogObserver,
     public MIAUpdateStarterObserver,
     public MIAUpdateRoamingHandlerObserver,
-    public MIAUpdateRefreshObserver,
-    public IAUpdateDialogObserver
+    public MIAUpdateRefreshObserver
     {
            
 public: //new functions
@@ -242,13 +234,6 @@
     TBool ForcedRefresh() const;
       
     void SetForcedRefresh( TBool aForcedRefresh );
-    
-    /**
-     *  Set node list to normal state after update. 
-     */
-    void RefreshNodeList();
-    
-    
     /**
      * Is client role "testing"
      *
@@ -338,13 +323,11 @@
 private: // From MIAUpdateWaitDialogObserver    
     
     /**
-     * This is called when the dialog is  closed.
+     * This is called when the dialog is about to be closed.
+     * @param aButtonId - Id of the button, which was used to cancel the dialog.
+     * @return ETrue, if it's ok to close the dialog, EFalse otherwise.
      */
-     void HandleWaitDialogCancel();   
-     
-private: // From IAUpdateDialogObserver     
-         
-     void dialogFinished(HbAction *action);   
+    TBool HandleDialogExitL( TInt aButtonId );   
     
 
 private: // From MIAUpdateRefreshObserver   
@@ -369,8 +352,6 @@
 
 
 private: // new functions
-    
-    void AgreementHandledL();
 
     /**
      * Called when refreshing updates list is completed.
@@ -448,7 +429,7 @@
      * @param aDisplayString       A string to be displayed
      * @param aVisibilityDelayOff  ETrue if visibility delay is off
      */                  
-    void ShowWaitDialogL( const QString& aDisplayString, 
+    void ShowWaitDialogL( const TDesC& aDisplayString, 
                           TBool aVisibilityDelayOff ); 
     
     /**
@@ -563,14 +544,6 @@
         ESelfUpdating
         };
 
-    enum TDialogState
-        {
-        ENoDialog,
-        EAgreement,
-        EInsufficientMemory  
-        };
-    
-    
     MIAUpdateUiControllerObserver& iObserver;
 
     MIAUpdateController* iController;
@@ -584,10 +557,8 @@
     RPointerArray<CIAUpdateNodeId> iPreviousSelections;
     
     RPointerArray<MIAUpdateNode> iServicePackNodes;
-    
-    IAUpdateDialogUtil *mDialogUtil;  
  
-    IAUpdateWaitDialog *mWaitDialog;
+    CIAUpdateWaitDialog* iWaitDialog;
     
     CIAUpdateProgressDialog* iProgressDialog;
     
@@ -613,8 +584,6 @@
     
     TState iState;
     
-    TDialogState iDialogState;
-    
     TBool iClosingAllowedByClient;
     
     CIAUpdateUiConfigData* iConfigData;
@@ -634,8 +603,6 @@
     TBool iForcedRefresh;
         
     TBool iTestRole;
-    
-    HbAction *mPrimaryAction;
 
     };