diff -r 682dd021f9be -r 7b3e49e4608a wlanutilities/wlanqtutilities/base/inc/wlanqtutils.h --- a/wlanutilities/wlanqtutilities/base/inc/wlanqtutils.h Thu Jun 10 15:44:54 2010 +0300 +++ b/wlanutilities/wlanqtutilities/base/inc/wlanqtutils.h Thu Jun 24 10:49:51 2010 +0300 @@ -59,7 +59,7 @@ /*! WLAN connection status. Remember to update traces/trace.properties when modifying this enum. - */ + */ enum ConnStatus { ConnStatusNone = 0, //!< Reserved. ConnStatusConnecting, //!< Connecting. @@ -67,6 +67,27 @@ ConnStatusDisconnected //!< Disconnected. }; + /*! + WLAN scan status + Remember to update traces/trace.properties when modifying this enum. + */ + enum ScanStatus { + ScanStatusOk = 0, //!< Scan succeeded. + ScanStatusCancelled, //!< Scan was cancelled. + ScanStatusError //!< Scan failed. + }; + + /*! + Internet Connectivity Test status. + Remember to update traces/trace.properties when modifying this enum. + */ + enum IctStatus { + IctPassed = 0, //!< Normal ICT passed. + IctHotspotPassed, //!< Hotspot ICT passed. + IctCancelled, //!< ICT was cancelled. + IctFailed //!< ICT failed. + }; + WlanQtUtils(); ~WlanQtUtils(); @@ -105,21 +126,28 @@ signals: /*! - Signal indicating that WLAN scan results are available. + Signal indicating that WLAN scan is complete when scanning + is requested with scanWlans() method. + + @param [in] status Scan status code (ScanStatus). */ - void wlanScanReady(); + void wlanScanReady(int status); /*! - Signal indicating that WLAN scan results are available when scanning + Signal indicating that WLAN scan is complete when scanning is requested with scanWlanAps() method. + + @param [in] status Scan status code (ScanStatus). */ - void wlanScanApReady(); + void wlanScanApReady(int status); /*! - Signal indicating that WLAN scan results are available when scanning + Signal indicating that WLAN scan is complete when scanning is requested with scanWlanDirect() method. + + @param [in] status Scan status code (ScanStatus). */ - void wlanScanDirectReady(); + void wlanScanDirectReady(int status); /*! Signal indicating that new WLAN network has been opened. @@ -143,9 +171,12 @@ Signal indicating result of finished ICT run. @param [in] iapId ID of IAP ICT was run for. - @param [in] result True: ICT passed, False: ICT failed. + @param [in] result IctPassed: Normal ICT passed, + IctHotspotPassed: Hotspot ICT passed, + IctCancelled: ICT was cancelled, + IctFailed: ICT failed */ - void ictResult(int iapId, bool result); + void ictResult(int iapId, int result); public slots: