--- a/usbengines/usbotgwatcher/src/cusbnotifmanager.cpp Fri Apr 23 23:57:55 2010 +0300
+++ b/usbengines/usbotgwatcher/src/cusbnotifmanager.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"
@@ -114,7 +114,7 @@
{
LOG_FUNC
- User::LeaveIfError(iNotifier.Connect());
+ LEAVEIFERROR(iNotifier.Connect());
iIndicatorNotifier = CUsbIndicatorNotifier::NewL(*this, aOtgWatcher);
@@ -179,7 +179,7 @@
CUsbNotifier* notifier(NULL);
if (aCat == KUsbUiNotifOtgError)
{
- __ASSERT_ALWAYS(aObserver != NULL, Panic(EWrongNotifierCategory));
+ ASSERT_PANIC(aObserver != NULL, EWrongNotifierCategory);
notifier = CUsbWaitNotifier::NewL(iNotifier, *this, aNotifId);
}
else if (aCat == KUsbUiNotifOtgWarning)
@@ -189,7 +189,7 @@
else
{
LOG1("Unexpected aCat = 0x%X", aCat );
- Panic(EWrongNotifierCategory);
+ PANIC(EWrongNotifierCategory);
}
CleanupStack::PushL(notifier);