--- a/usbengines/usbotgwatcher/src/cusbotgstateobserver.cpp	Fri Mar 19 09:48:52 2010 +0200
+++ b/usbengines/usbotgwatcher/src/cusbotgstateobserver.cpp	Fri Apr 16 16:02:21 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"
@@ -39,7 +39,7 @@
     {
     LOG_FUNC
 
-    User::LeaveIfError(iOtgState.Attach(KUidUsbManCategory,
+    LEAVEIFERROR(iOtgState.Attach(KUidUsbManCategory,
             KUsbOtgStateProperty));
 
     }
@@ -88,7 +88,7 @@
     if (KErrNone != err)
         {
         LOG("CanNotGetOtgStateProperty" );
-        Panic( ECanNotGetOtgStateProperty);
+        PANIC( ECanNotGetOtgStateProperty);
         }
 
     return (TUsbOtgState) val;
@@ -107,7 +107,7 @@
     if (KErrNotFound != iObservers.Find(&aObserver))
         {
         LOG( "Observer already exists"  );
-        Panic( EObserverAlreadyExists);
+        PANIC( EObserverAlreadyExists);
         return;
         }
     iObservers.AppendL(&aObserver);
@@ -132,7 +132,7 @@
     if (KErrNotFound == i)
         {
         LOG("Observer not found");
-        Panic( ECanNotFindOtgStateObserver);
+        PANIC( ECanNotFindOtgStateObserver);
         return;
         }
 
@@ -245,7 +245,7 @@
         default:
             {
             LOG("WrongOtgState" );
-            Panic( EWrongOtgState);
+            PANIC( EWrongOtgState);
             }
         }