diff -r 218231f2b3b3 -r f45583a69686 usbuis/usbindicatorplugin/src/usbaddressedindicator.cpp --- a/usbuis/usbindicatorplugin/src/usbaddressedindicator.cpp Fri Jun 11 14:38:00 2010 +0300 +++ b/usbuis/usbindicatorplugin/src/usbaddressedindicator.cpp Wed Jun 23 19:20:39 2010 +0300 @@ -15,12 +15,12 @@ * */ #include "usbaddressedindicator.h" -#include +#include #include #include -#include #include "usbindicatorplugin.h" #include "usbindicator.h" +#include "usbdebug.h" /*! @@ -30,27 +30,27 @@ HbIndicatorInterface(indicatorType, HbIndicatorInterface::ProgressCategory, InteractionActivated) - { - } +{ +} /*! UsbAddressedIndicator::~UsbAddressedIndicator */ UsbAddressedIndicator::~UsbAddressedIndicator() - { - } +{ +} /*! UsbAddressedIndicator::handleInteraction */ bool UsbAddressedIndicator::handleInteraction(InteractionType type) - { +{ + myDebug() << ">>> UsbAddressedIndicator::handleInteraction"; bool handled = false; TUidType uidtype(KExecutableImageUid, TUid::Uid(0x00), TUid::Uid(KUSBUIUid)); - if (type == InteractionActivated) - { + if (type == InteractionActivated) { RProcess usbUiProcess; TInt result = usbUiProcess.Create(KUSBExe(), KNullDesC, uidtype); if (result == KErrNone) { @@ -58,9 +58,10 @@ } usbUiProcess.Close(); handled = true; - } + } + myDebug() << "<<< UsbAddressedIndicator::handleInteraction"; return handled; - } +} /*! UsbAddressedIndicator::indicatorData @@ -68,21 +69,21 @@ */ QVariant UsbAddressedIndicator::indicatorData(int role) const { - switch(role) - { - case PrimaryTextRole: - { - QString text = QString(hbTrId("txt_usb_dblist_usb_connecting")); - return text; - } - case DecorationNameRole: - { - QString iconName(KUsbIconFile); - return iconName; - } - default: - return QVariant(); - } + myDebug() << ">>> UsbAddressedIndicator::indicatorData"; + switch (role) { + case PrimaryTextRole: + { + QString text = QString(hbTrId("txt_usb_dblist_usb_connecting")); + return text; + } + case DecorationNameRole: + { + QString iconName(KUsbIconFile); + return iconName; + } + default: + return QVariant(); + } } /*! @@ -92,19 +93,18 @@ bool UsbAddressedIndicator::handleClientRequest( RequestType type, const QVariant ¶meter) { + myDebug() << ">>> UsbAddressedIndicator::handleClientRequest"; switch (type) { - case RequestActivate: - { - emit dataChanged(); - } - - break; - default: - emit deactivate(); - break; + case RequestActivate: + emit dataChanged(); + break; + default: + emit deactivate(); + break; } - //request always handled - return true; + myDebug() << "<<< UsbAddressedIndicator::handleClientRequest"; + //request always handled + return true; }