--- a/usbengines/usbotgwatcher/src/cusbidpinobserver.cpp Fri Mar 12 15:48:40 2010 +0200
+++ b/usbengines/usbotgwatcher/src/cusbidpinobserver.cpp Mon Mar 15 12:44:42 2010 +0200
@@ -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"
@@ -41,7 +41,7 @@
{
LOG_FUNC
- User::LeaveIfError(iIdPin.Attach(KUidUsbManCategory,
+ LEAVEIFERROR(iIdPin.Attach(KUidUsbManCategory,
KUsbOtgIdPinPresentProperty));
}
@@ -92,7 +92,7 @@
if (KErrNone != err)
{
LOG("CanNotGetIdPinProperty" );
- Panic( ECanNotGetIdPinProperty);
+ PANIC( ECanNotGetIdPinProperty);
}
return (EFalse == val ? EIdPinOff : EIdPinOn);
@@ -110,7 +110,7 @@
if (KErrNotFound != iObservers.Find(&aObserver))
{
LOG("Observer already exists" );
- Panic( EObserverAlreadyExists);
+ PANIC( EObserverAlreadyExists);
return;
}
iObservers.AppendL(&aObserver);
@@ -135,7 +135,7 @@
if (KErrNotFound == i)
{
LOG("Observer not found");
- Panic( ECanNotFindIdPinObserver);
+ PANIC( ECanNotFindIdPinObserver);
return;
}
@@ -188,7 +188,6 @@
}
break;
}
- ;
case EIdPinOff:
{
@@ -200,12 +199,11 @@
}
break;
}
- ;
default:
{
LOG("WrongIdPinState");
- Panic( EWrongIdPinState);
+ PANIC( EWrongIdPinState);
}
}