bluetoothengine/bteng/inc/btengactive.inl
branchRCL_3
changeset 56 9386f31cc85b
parent 55 613943a21004
--- a/bluetoothengine/bteng/inc/btengactive.inl	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengactive.inl	Wed Sep 01 12:20:04 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -73,9 +73,10 @@
 //
 inline void CBTEngActive::DoCancel()
     {
-    iObserver.CancelRequest( iRequestId );
     }
 
+
+
 // -----------------------------------------------------------------------------
 // Get the identifier of this instance.
 // -----------------------------------------------------------------------------
@@ -105,6 +106,17 @@
     SetActive();
     }
 
+
+// -----------------------------------------------------------------------------
+// Cancel an outstanding request.
+// -----------------------------------------------------------------------------
+//
+inline void CBTEngActive::CancelRequest()
+    {
+    Cancel();
+    }
+
+
 // -----------------------------------------------------------------------------
 // Get a reference to the active object request status.
 // -----------------------------------------------------------------------------
@@ -114,6 +126,7 @@
     return iStatus;
     }
 
+
 // ---------------------------------------------------------------------------
 // From class CActive.
 // Called by the active scheduler when the request has been completed.
@@ -121,7 +134,7 @@
 //
 inline void CBTEngActive::RunL()
     {
-    iObserver.RequestCompletedL( this, iStatus.Int() );
+    iObserver.RequestCompletedL( this, iRequestId, iStatus.Int() );
     }
 
 
@@ -132,6 +145,6 @@
 //
 inline TInt CBTEngActive::RunError( TInt aError )
     {
-    iObserver.HandleError( this, aError );
+    iObserver.HandleError( this, iRequestId, aError );
     return KErrNone;
     }