diff -r 613943a21004 -r 9386f31cc85b bluetoothengine/bteng/inc/btengsrvsettingsmgr.h
--- a/bluetoothengine/bteng/inc/btengsrvsettingsmgr.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengsrvsettingsmgr.h	Wed Sep 01 12:20:04 2010 +0100
@@ -29,7 +29,6 @@
 #include "btengactive.h"
 
 class CBTEngServer;
-class CHbIndicatorSymbian;
 
 
 /**
@@ -113,13 +112,12 @@
     void StopBTStackL();
 
     /**
-     * Handles a power event that HW power is going to turn off or
-     * has been changed turned on.
+     * Update the central repository key for Bluetooth power state.
      *
-     * @since Symbian^4
-     * @param aValue The new Bluetooth HW power state.
+     * @since Symbian^3
+     * @param aValue The new Bluetooth power state.
      */
-    void HandleHwPowerChangeL( TBTPowerState aValue );
+    void UpdateCenRepPowerKeyL( TBTPowerState aValue );
 
     /**
     * ?description
@@ -131,11 +129,12 @@
     
     /**
     * ?description
-    * 
-    * @param aState Current State of the Bluetooth
+    *
+    * @since S60 v3.2
+    * @param ?arg1 ?description
     */
-    void SetIndicatorStateL( const TInt aState );
-    
+    void SetIndicatorStateL( const TInt aIndicator, const TInt aState );
+
     /**
      * Update the Bluetooth visibility mode.
      *
@@ -200,26 +199,21 @@
      *
      * @since Symbian^3
      * @param aActive Pointer to the active object that completed.
+     * @param aId The ID that identifies the outstanding request.
      * @param aStatus The status of the completed request.
      */
-    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aStatus );
-    
-    /**
-     * Callback for handling cancelation of an outstanding request.
-     *
-     * @param aId The ID that identifies the outstanding request.
-     */
-    virtual void CancelRequest( TInt aRequestId );
-    
+    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, TInt aStatus );
+
     /**
      * From MBTEngActiveObserver.
      * Callback to notify that an error has occurred in RunL.
      *
      * @since Symbian^3
      * @param aActive Pointer to the active object that completed.
+     * @param aId The ID that identifies the outstanding request.
      * @param aStatus The status of the completed request.
      */
-    virtual void HandleError( CBTEngActive* aActive, TInt aError );
+    virtual void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
 
 private:
 
@@ -251,7 +245,7 @@
      * @param aTemporary Indicates if this is about a tempororary state change.
      */
     void CheckTemporaryPowerStateL( TBTPowerState& aCurrentState,
-                                     TBTPowerState aNewState, TBool aTemporary );  
+                                     TBTPowerState aNewState, TBool aTemporary );
 
 private: // data
 
@@ -305,15 +299,6 @@
      */
     RMessage2 iMessage;
     
-    /**
-     *  Orbit Indicator to display Bluetooth Status
-     */
-    CHbIndicatorSymbian* iBTIndicator;
-    
-    /*
-     *  Indicator State
-     */
-    TInt iIndicatorState;
     };