diff -r acbdfeb56752 -r eadeea68c837 usbengines/usbotgwatcher/inc/cusbindicatornotifier.h --- a/usbengines/usbotgwatcher/inc/cusbindicatornotifier.h Tue Jul 13 00:13:42 2010 +0300 +++ b/usbengines/usbotgwatcher/inc/cusbindicatornotifier.h Tue Jul 13 00:24:10 2010 +0300 @@ -40,8 +40,11 @@ * Class implements functionality of showing/blinking usb indicator * Class does not provide method to get response from the user */ -NONSHARABLE_CLASS( CUsbIndicatorNotifier ): public CUsbNotifier, MUsbOtgWatcherStateObserver, MUsbVBusObserver +NONSHARABLE_CLASS( CUsbIndicatorNotifier ): public MUsbOtgWatcherStateObserver, MUsbVBusObserver { + + friend class CtUsbOtgWatcher; + public: /** * Two-phased constructor. @@ -78,12 +81,6 @@ */ virtual void VBusObserverErrorL(TInt aError); - // From base class CUsbNotifier - /** - * Start to show notifier - */ - virtual void ShowL(); - /** * Stop showing notifier */ @@ -104,23 +101,10 @@ void ConstructL(); /** - * Set USB indicator On or Off + * Set USB Connecting indicator On or Off * @param aState Indicator states */ - void SetIndicatorState(const TInt aState); - - /** - * Show/hide static icon of the indicator. - * If the indicator is blinking, stop blinking it and show/hide the static - * form of the indicator. - * @param aVisible ETrue - Show the indicator, EFalse - Hide the indicator - */ - void ShowStatic(TBool aVisible); - - /** - * Blinks indicator - */ - void Blink(); + void ToggleConnectingIndicator(TBool aEnable); /** * Sets indicator accordingly