diff -r 0ffee699d6c7 -r 878846f7623e usbengines/usbotgwatcher/src/cusbtimer.cpp
--- a/usbengines/usbotgwatcher/src/cusbtimer.cpp	Fri Apr 23 23:57:55 2010 +0300
+++ b/usbengines/usbotgwatcher/src/cusbtimer.cpp	Sat Apr 24 00:13:51 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2008 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"
@@ -48,7 +48,7 @@
 void CUsbTimer::ConstructL()
     {
     LOG_FUNC
-    User::LeaveIfError(iTimer.CreateLocal());
+    LEAVEIFERROR(iTimer.CreateLocal());
     }
 
 // ---------------------------------------------------------------------------
@@ -91,7 +91,7 @@
 
     if (KErrNone != iStatus.Int())
         {
-        User::Leave(iStatus.Int());
+        LEAVE(iStatus.Int());
         }
 
     iObserver.TimerElapsedL(iTimerId);