FCL/sf/mw/usbservices: comparison usbengines/usbotgwatcher/src/cusbnotifmanager.cpp

equal deleted inserted replaced

-:0ffee699d6c7
+:878846f7623e
 /*
-* 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"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 void CUsbNotifManager::ConstructL(CUsbOtgWatcher& aOtgWatcher)
 {
 LOG_FUNC
-User::LeaveIfError(iNotifier.Connect());
+LEAVEIFERROR(iNotifier.Connect());
 iIndicatorNotifier = CUsbIndicatorNotifier::NewL(*this, aOtgWatcher);
 }
 // As notifiers can be more than two types such as warning, error, indicator ...
 // to create concret notifiers according to categories instead of checking aObserver null
 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)
 {
 notifier = CUsbWarningNotifier::NewL(iNotifier, *this, aNotifId);
 }
 else
 {
 LOG1("Unexpected aCat = 0x%X", aCat );
-Panic(EWrongNotifierCategory);
+PANIC(EWrongNotifierCategory);
 }
 CleanupStack::PushL(notifier);
 iWaitNotifiers.AppendL(CWaitNotifierInfo::NewL(notifier, *aObserver));