diff -r 19bd632b5100 -r b72428996822 btobexprofiles/obexsendservices/obexservicesendutils/inc/BTServiceStarter.h
--- a/btobexprofiles/obexsendservices/obexservicesendutils/inc/BTServiceStarter.h	Fri May 28 17:03:06 2010 +0300
+++ b/btobexprofiles/obexsendservices/obexservicesendutils/inc/BTServiceStarter.h	Mon Jul 12 18:51:05 2010 +0300
@@ -24,14 +24,12 @@
 #include "BTServiceAPI.h"
 #include "BTServiceUtils.h"
 #include "BTServiceParameterList.h"
+#include "BTServiceDelayedDestroyer.h"
 
 #include <btengdiscovery.h>
 #include <btengsettings.h>
 #include <obexutilsdialog.h>
 #include <msvapi.h>
-#include <hbdevicedialogsymbian.h>
-#include <hb/hbwidgets/hbdeviceprogressdialogsymbian.h>
-#include <hbsymbianvariant.h>
 
 // DATA TYPES
 
@@ -54,7 +52,6 @@
 class CObexUtilsUiLayer;
 class MBTServiceProgressGetter;
 class CBTSController;
-class CBTSProgressTimer;
 
 
 const TUint KBTSdpObjectPush            = 0x1105;
@@ -83,7 +80,8 @@
         * @param aGetter A pointer to a progess status getter object.
         * @return None.
         */
-        virtual void LaunchProgressNoteL( MBTServiceProgressGetter* aGetter, TInt aTotalSize, TInt aFileCount ) = 0;
+        //todo reusing the second param aTotalsize to aFileCount as it wass no longer used check it being used in other places
+        virtual void LaunchProgressNoteL( MBTServiceProgressGetter* aGetter, TInt aFileCount) = 0;
         
         
         /**
@@ -93,21 +91,12 @@
         */
         virtual void UpdateProgressNoteL(TInt aFileSize,TInt aFileIndex, const TDesC& aFileName ) = 0;
         
-
-        /**
-        * Informs the observer that a progress note should be shown.
-        * @param aGetter A pointer to a progess status getter object.
-        * @return None.
-        */
-        virtual void UpdateProgressInfoL() = 0;
-        
-        
         /**
         *  Informs the observer that a confirmation query for sending
-        *  should be shouwn for BIP sendign
+        *  should be shouwn for BIP sending
         *  @return
         */ 
-        virtual TInt LaunchConfirmationQuery(TInt aResouceId)=0;        
+        virtual void LaunchConfirmationQuery(const TDesC& aConfirmText)=0; 
         
         /**
         *  Informs the observer that a connect is timedout        
@@ -126,9 +115,7 @@
                           public MObexUtilsDialogObserver,
                           public MObexUtilsProgressObserver,
                           public MBTEngSdpResultReceiver,
-                          public MBTEngSettingsObserver,
-                          public MHbDeviceProgressDialogObserver,
-						  public MHbDeviceDialogObserver 
+                          public MBTEngSettingsObserver
     {
     public:  // Constructors and destructor
         
@@ -170,9 +157,11 @@
         * From MBTServiceObserver A progress note should be shown.
         * @param aGetter A pointer to a progess status getter object.
         * @param aTotalSize Max size of the progress bar.
+        * @param aFileCount Total Number of files to be sent
         * @return None.
         */
-        void LaunchProgressNoteL( MBTServiceProgressGetter* aGetter, TInt aTotalSize, TInt aFileCount );
+        //todo reuse the second param as it is no longer used check it being used in other places
+        void LaunchProgressNoteL( MBTServiceProgressGetter* aGetter, TInt aFileCount);
         
         
         /**
@@ -184,32 +173,15 @@
         */
         void UpdateProgressNoteL(TInt aFileSize,TInt aFileIndex, const TDesC& aFileName );
 		
-      /**
-        * From MBTServiceObserver Updating progress note info about the progress percentage
-        * @return None.
-        */
-         void UpdateProgressInfoL();
 
         /**
         * From MObexUtilsWaitDialogObserver The wait note has been dismissed.
         * @param aButtonId The button id that was used to dismiss the dialog.
         * @return None.
         */
-        void DialogDismissed( TInt aButtonId );
+        void DialogDismissed(TInt aButtonId);
         
         /**
-		* From MHbDeviceProgressDialogObserver
-		*
-		*/
-        void ProgressDialogCancelled(const CHbDeviceProgressDialogSymbian *  aDialog);
-        
-	  /**
-		* From MHbDeviceProgressDialogObserver
-		*
-		*/
-        void ProgressDialogClosed(const CHbDeviceProgressDialogSymbian *  aDialog )  ; 
-
-        /**
         * From MObexUtilsProgressObserver request for number of bytes sent
         * @Param None.
         * @return Number of bytes sent.
@@ -223,6 +195,13 @@
         */ 
         TInt LaunchConfirmationQuery(TInt aResourceId); 
         
+        
+        /**
+        *  From MBTServiceObserver A confirmation query for BIP
+        *  profile  should be shown.
+        */ 
+        void LaunchConfirmationQuery(const TDesC& aConfirmText);
+        
         /**
         *  From MBTServiceObserver a connect request is timedout        
         *  @return
@@ -414,7 +393,7 @@
         * @param aReason Error value
         * @return None.
         */
-        void ShowNote( TInt aReason ) const;
+        void ShowErrorNote( TInt aReason ) const;
 
         /**
         * Cancel progress note
@@ -449,9 +428,6 @@
          */
         void TurnBTPowerOnL( const TBTPowerStateValue aState );
         
-        void DataReceived(CHbSymbianVariantMap& aData);
-       
-        void DeviceDialogClosed(TInt aCompletionCode);
     private:    // Data definitions
 
         enum TBTServiceStarterState
@@ -468,12 +444,14 @@
         CBTDevice*                  iDevice;
         CBTEngDiscovery*            iBTEngDiscovery;
         CBTServiceParameterList*    iList;
- //       CObexUtilsDialog*           iDialog;
+        CObexUtilsDialog*           iDialog;
         CBTSController*       iController;
 
         TBTServiceType              iService;
         TInt                        iClientChannel;
         TBTServiceStarterState      iState;
+        //todo verify the usage of below variable when file sending to mulitple devices or
+        //when files from different applications are sent simultaneously
         TBool                       iServiceStarted;
         TMsvId                      iMessageServerIndex;
         
@@ -481,6 +459,8 @@
         CActiveSchedulerWait*       iWaiter;
         TBool                       iAllSend;                     
         TInt						iBytesSendWithBIP;        
+        //todo verify the usage of below variable as this part of legacy code
+        //and false condition will never be hit.
         TBool						iProgressDialogActive;        
         TBool                       iUserCancel;
         CBTEngSettings*             iBTEngSettings;
@@ -493,11 +473,8 @@
         TBool                       iFeatureManagerInitialized;
         TBool                       iTriedBIP;
         TBool                       iTriedOPP;
-        CHbDeviceDialogSymbian *iDeviceDialog;
-        CHbDeviceProgressDialogSymbian *iProgressDialog;
-        TInt                        iFileCount;
-        TInt                        iFileIndex;
-        CBTSProgressTimer *iProgressTimer;
+        CBTServiceDelayedDestroyer* iDelayedDestroyer;
+        TBool                       iLocalisationInit;
     };
 
 #endif      // BT_SERVICE_CONTROLLER_H