--- a/filebrowser/engine/FBFileUtils.h	Thu Jun 17 15:34:52 2010 +0300
+++ b/filebrowser/engine/FBFileUtils.h	Thu Jun 24 14:55:55 2010 +0300
@@ -24,9 +24,7 @@
 #include <w32std.h>
 #include <badesca.h>
 #include <coedef.h>
-#include <AknServerApp.h>
 #include <msvapi.h>
-#include <AknProgressDialog.h>
 #include <tz.h>
 #include "FB.hrh"
 
@@ -40,16 +38,10 @@
 // FORWARD DECLARATIONS
 class CEngine;
 class CFileBrowserFileOps;
-class CAknIconArray;
-class TAknsItemID;
 class CDocumentHandler;
-//class CAknWaitDialog;
-//class CAknProgressDialog;
 class CEikProgressInfo;
 class CFBFileOpClient;
-//class CAknProgressDialog;
 class CEikProgressInfo;
-class CAknOpenFileService;
 class CMessageDigest;
 
 // CLASS DECLARATIONS
@@ -182,7 +174,7 @@
 
 
 
-class CFileBrowserFileUtils : public CActive, public MAknServerAppExitObserver, public MMsvSessionObserver//, public MProgressDialogCallback
+class CFileBrowserFileUtils : public CActive, public MMsvSessionObserver
 	{
 private:
     enum TState // active object states
@@ -209,9 +201,6 @@
         TInt RunError(TInt aError);
 	void DoCancel();
 
-private: // from MAknServerAppExitObserver
-    void HandleServerAppExit(TInt aReason);
-
 private: // from MMsvSessionObserver
     void HandleSessionEventL(TMsvSessionEvent aEvent, TAny* aArg1, TAny* aArg2, TAny* aArg3);
 
@@ -346,10 +335,10 @@
     TState                          iState;
     CEngine*                        iEngine;
     CFileBrowserFileOps*            iFileOps;
-//    CAknWaitDialog*                 iWaitDialog;
+
     TBool                           isWaitDialog;
     TBool                           isProgressDialog;
-//    CAknProgressDialog*             iProgressDialog;
+
     CEikProgressInfo*               iProgressInfo;
     CCommandArray*                  iCommandArray;
     TInt                            iCurrentEntry;
@@ -375,7 +364,7 @@
     CFileEntryList*                 iCurrentSelectionList;
     TSearchAttributes               iSearchAttributes;
     CDocumentHandler*               iDocHandler;
-    CAknOpenFileService*            iOpenFileService;
+
     RFile                           iMsgStoreWalkFile;
     TInt                            iPrevFolderIndex;
     TFileName                       iPrevFolderName;