--- a/bluetoothengine/bteng/inc/btengactive.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengactive.h	Fri May 14 16:01:46 2010 +0300
@@ -40,7 +40,6 @@
  */
 class MBTEngActiveObserver
     {
-
 public:
 
     /**
@@ -48,25 +47,27 @@
      *
      * @since S60 v3.2
      * @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 aId, 
-                                    TInt aStatus ) = 0;
+    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aStatus ) = 0;
+
+    /**
+     * Callback for handling cancelation of an outstanding request.
+     *
+     * @since Symbian^4
+     * @param aId The ID that identifies the outstanding request.
+     */
+    virtual void CancelRequest( TInt aRequestId ) = 0;
 
     /**
      * Callback to notify that an error has occurred in RunL.
      *
      * @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.
+     * @param aError The error occurred in RunL.
      */
-    virtual void HandleError( CBTEngActive* aActive, TInt aId, 
-                                    TInt aError ) = 0;
-
+    virtual void HandleError( CBTEngActive* aActive, TInt aError ) = 0;
     };
 
-
 /**
  *  Class CBTEngActive
  *
@@ -122,13 +123,6 @@
     inline void GoActive();
 
     /**
-     * Cancel an outstanding request.
-     *
-     * @since S60 v3.2
-     */
-    inline void CancelRequest();
-
-    /**
      * Get a reference to the active object request status.
      *
      * @since S60 v3.2
@@ -136,6 +130,7 @@
      */
     TRequestStatus& RequestStatus();
 
+private:
 // from base class CActive
 
     /**