--- a/usbengines/usbotgwatcher/src/cusbnotenotifier.cpp	Fri Mar 19 09:48:52 2010 +0200
+++ b/usbengines/usbotgwatcher/src/cusbnotenotifier.cpp	Fri Apr 16 16:02:21 2010 +0300
@@ -110,12 +110,13 @@
 
     if (IsActive())
         {
-        Panic( ENotifierIsActiveAlready);
+        PANIC( ENotifierIsActiveAlready);
         return;
-        }    
-		
+        }
+
     iNotifIdPckg() = iUsbNoteNotifier.iNotifId;
-    iNotifier.StartNotifierAndGetResponse(iStatus, iUsbNoteNotifier.iCat, iNotifIdPckg, iRes);
+    iNotifier.StartNotifierAndGetResponse(iStatus, iUsbNoteNotifier.iCat,
+            iNotifIdPckg, iRes);
     SetActive();
     }
 
@@ -130,7 +131,7 @@
     LOG1( "iStatus = %d" , iStatus.Int());
 
     // if error occured, deal with it in RunError
-    User::LeaveIfError(iStatus.Int());
+    LEAVEIFERROR(iStatus.Int());
 
     iNotifier.CancelNotifier(iUsbNoteNotifier.iCat);