FCL/sf/mw/wirelessacc: comparison wlanutilities/wlanwizard/src/wlanwizardpagescanning.cpp

equal deleted inserted replaced

-:7b3e49e4608a
+:72ebcbb64834
 mLoader(NULL),
 mNextPageId(WlanWizardPage::PageNone),
 mScanResultsAvailable(false),
 mScanStatus(WlanQtUtils::ScanStatusOk)
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_ENTRY );
 WlanQtUtils* utils = mWizard->wlanQtUtils();
 // Connect normal scan completion signal from wlanQtUtils to result
 // handler. Connect here instead of initializePage, since this signal may
 // need to be caught event if the window is not active.
 SIGNAL(wlanScanApReady(int)),
 this,
 SLOT(wlanScanResultPreCheck(int)));
 Q_ASSERT(ok);
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_EXIT );
 }
 /*!
 * Destructor. Loader widget is deleted.
 * All document widgets are deleted by wlanwizard_p destructor.
 */
 WlanWizardPageScanning::~WlanWizardPageScanning()
 {
+OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_ENTRY );
 delete mLoader;
+OstTraceFunctionExit0( DUP1_WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_EXIT );
 }
 /*!
 * Page initialization. If view is already loaded, does nothing. Inherited from
 * WlanWizardPage.
 * @return pointer to widget "occ_add_wlan_06".
 */
 HbWidget* WlanWizardPageScanning::initializePage()
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_INITIALIZEPAGE_ENTRY );
 OstTrace0(
 TRACE_NORMAL,
 WLANWIZARDPAGESCANNING_INITIALIZEPAGE,
 "WlanWizardPageScanning::initializePage");
 mLabel->setPlainText(HbParameterLengthLimiter(
 hbTrId("txt_occ_dialog_searching")).arg(mWizard->configuration(
 WlanWizardPrivate::ConfSsid).toString()));
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_INITIALIZEPAGE_EXIT );
 return mWidget;
 }
 /*!
 * Sends the user to the next page.
 * stacked widget after "Next" button is pressed.
 * @return the id value of the next page.
 */
 int WlanWizardPageScanning::nextId(bool &removeFromStack) const
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_NEXTID_ENTRY );
 removeFromStack = true;
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_NEXTID_EXIT );
 return mNextPageId;
 }
 /*!
 * This function reimplements WlanWizardPage::previousTriggered. When going
 * opration and immediately connected again.
 * @return one step backwards value.
 */
 int WlanWizardPageScanning::previousTriggered()
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_PREVIOUSTRIGGERED_ENTRY );
 disconnect(this, SLOT(wlanScanDirectReady(int)));
 disconnect(this, SLOT(wlanScanResultPreCheck(int)));
 WlanQtUtils* utils = mWizard->wlanQtUtils();
 SIGNAL(wlanScanDirectReady(int)),
 this,
 SLOT(wlanScanDirectReady(int)));
 Q_ASSERT(ok);
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_PREVIOUSTRIGGERED_EXIT );
 return OneStepBackwards;
 }
 /*!
 * @return always false - the scanning proceeds to next window
 * automatically or not at all.
 */
 bool WlanWizardPageScanning::showPage()
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_SHOWPAGE_ENTRY );
 mWizard->setConfiguration(WlanWizardHelper::ConfProcessSettings, false);
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_SHOWPAGE_EXIT );
 return false;
 }
 /*!
 * Reimplements the default function in WlanWizardPage. Indicates to the
 * @return true
 * @see WlanWizardPage
 */
 bool WlanWizardPageScanning::requiresStartOperation()
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_REQUIRESSTARTOPERATION_ENTRY );
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_REQUIRESSTARTOPERATION_EXIT );
 return true;
 }
 /*!
 * Wlan scan is performed as a "post-initialization" which is executed in a
 * separate scheduler loop. If scan results are available, starts reading them.
 */
 void WlanWizardPageScanning::startOperation()
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_STARTOPERATION_ENTRY );
 OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_STARTOPERATION,
 "WlanWizardPageScanning::startOperation - start AP scan if results"
 " are available." );
 if (mScanResultsAvailable) {
 mScanResultsAvailable = false;
 wlanScanApReady();
 }
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_STARTOPERATION_EXIT );
 }
 /*!
 * Loads the document orientation information from occ_add_wlan_06.docml
 * This is called each time phone orientation changes.
 * @param [in] orientation indicates whether the phone is in portrait or
 * landscape mode.
 */
 void WlanWizardPageScanning::loadDocmlSection(Qt::Orientation orientation)
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_LOADDOCMLSECTION_ENTRY );
 OstTrace1( TRACE_NORMAL, WLANWIZARDPAGESCANNING_LOADDOCML,
 "WlanWizardPageScanning::loadDocml - orientation ;orientation=%x",
 ( TUint )( orientation ) );
 WlanWizardPageInternal::loadDocmlSection(
 mLoader,
 orientation,
 ":/docml/occ_add_wlan_06.docml",
 "portrait_section",
 "landscape_section");
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_LOADDOCMLSECTION_EXIT );
 }
 /*!
 * Checks whether the view is active. If it is, execute wlanScanApReady. If
 * not, set mScanResultsAvailable to true.
 * @param [in] scanStatus indicates whether the scan was succesful, cancelled of
 * failed. The argument is saved to a member variable.
 */
 void WlanWizardPageScanning::wlanScanResultPreCheck(int scanStatus)
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK_ENTRY );
 mScanStatus = scanStatus;
 if (!mWidget) {
 OstTrace1( TRACE_BORDER, WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK,
 "WlanWizardPageScanning::wlanScanResultPreCheck no widget;this=%x",
 " not current widget" );
 mScanResultsAvailable = true;
 }
 }
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK_EXIT );
 }
 /*!
 * Processes the direct scan results.
 * @param [in] scanStatus indicates whether the scan was succesful, canceled or
 * failed. In case the scan was not succesful, always proceed to manual wizard.
 */
 void WlanWizardPageScanning::wlanScanDirectReady(int scanStatus)
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY_ENTRY );
 OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY,
 "WlanWizardPageScanning::wlanScanDirectReady" );
 WlanQtUtils* utils = mWizard->wlanQtUtils();
 }
 // Process the scan results. If scan status is not ok, feed an empty
 // result table to the selection function.
 selectNextPageActions(filteredResults);
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY_EXIT );
 }
 /*!
 * All wlan channels have been scanned for public networks. After processing the
 * results a direct scan is initiated. This function also checks whether the
 * scan was succesful, canceled or failed. In case the scan was not succesful,
 * always proceed to manual wizard.
 */
 void WlanWizardPageScanning::wlanScanApReady()
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANAPREADY_ENTRY );
 OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_WLANSCANAPREADY,
 "WlanWizardPageScanning::wlanScanApReady" );
 if (mScanStatus == WlanQtUtils::ScanStatusOk) {
 WlanQtUtils* utils = mWizard->wlanQtUtils();
 else {
 mWizard->clearConfiguration(WlanWizardHelper::ConfAvailableNetworkOptions);
 mNextPageId = WlanWizardPageInternal::PageNetworkMode;
 mWizard->nextPage();
 }
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANSCANAPREADY_EXIT );
 }
 /*!
 * This function stores all the APs that match ssid parameter to mWlanApList
 * member list.
 */
 void WlanWizardPageScanning::getSsidMatchList(
 QString ssid,
 const QList<QSharedPointer<WlanQtUtilsAp> > &matchList)
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_GETSSIDMATCHLIST_ENTRY );
 mWlanApList.clear();
 QSharedPointer<WlanQtUtilsAp> item;
 for (int i = 0; i < matchList.size(); i++) {
 item = matchList.at(i);
 if (item->value(WlanQtUtilsAp::ConfIdSsid).toString() == ssid) {
 mWlanApList.append(item);
 }
 }
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_GETSSIDMATCHLIST_EXIT );
 }
 /*
 * Find out which of the direct scan results are open networks by comparing
 * result to open scan results. Return finalResults.
 void WlanWizardPageScanning::getFinalScanResults(
 const QList<QSharedPointer<WlanQtUtilsAp> > &directScanResults,
 const QList<QSharedPointer<WlanQtUtilsAp> > &openScanResults,
 QList<WlanScanResult> &finalResults)
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_GETFINALSCANRESULTS_ENTRY );
 finalResults.clear();
 // The key assumption of this algorithm is that both direct and public scan
 // reveal the same set of AP:s with the exception of hidden AP:s.
 // In other words: Direct scan result set is the whole set with each AP
 }
 }
 finalResults.append(resultItem);
 }
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_GETFINALSCANRESULTS_EXIT );
 }
 /*!
 * This function processes the scan results in case multiple results were
 * acquired with matching SSIDs.
 * @return the identifier of the next page.
 */
 int WlanWizardPageScanning::processMultipleScanResults(
 const QList<WlanScanResult> &finalResults)
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_PROCESSMULTIPLESCANRESULTS_ENTRY );
 WlanWizardScanList networkOptions;
 int nextPage;
 // Build the list of results to be placed in the configuration.
 networkOptions.build(finalResults);
 tmp.setValue(networkOptions);
 mWizard->setConfiguration(
 WlanWizardHelper::ConfAvailableNetworkOptions, tmp);
-// If there are more than one network mode choices, go to manual selection
+if (networkOptions.wpsSelected()) {
-// of network mode.
+// In case all available network mode options support wps, go directly
-if (networkOptions.netModes() > SingleResult) {
+// to wps-wizard.
+nextPage = WlanWizardPageInternal::PageWpsStart;
+} else if (networkOptions.netModes() > SingleResult) {
+// If there are more than one network mode choices, go to manual selection
+// of network mode.
 nextPage = WlanWizardPageInternal::PageNetworkMode;
 } else {
 // if only a single network mode option is available, the mode query
 // may be skipped and the next page is set to security mode query.
 WlanNetworkSetting setting = networkOptions.getNetModes().at(0);
 mWizard->setConfiguration(WlanWizardHelper::ConfNetworkMode, setting.mode);
 mWizard->setConfiguration(WlanWizardHelper::ConfHiddenWlan, setting.hidden);
+mWizard->setConfiguration(WlanWizardHelper::ConfWpsSupported, setting.wpsSupported);
 nextPage = WlanWizardPageInternal::PageNetworkSecurity;
 }
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_PROCESSMULTIPLESCANRESULTS_EXIT );
 return nextPage;
 }
 /*!
 * This function decides what to do with the scan results.
 * @param [in] finalResults is the list of APs revealed by the last scans.
 */
 void WlanWizardPageScanning::selectNextPageActions(
 const QList<WlanScanResult> &finalResults)
 {
+OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_SELECTNEXTPAGEACTIONS_ENTRY );
 mWizard->clearConfiguration(WlanWizardHelper::ConfAvailableNetworkOptions);
 if (finalResults.isEmpty()) {
 // In case of no results at all were found.
 mNextPageId = WlanWizardPageInternal::PageNetworkMode;
 mWizard->setConfiguration(WlanWizardHelper::ConfProcessSettings, true);
 mNextPageId = processMultipleScanResults(finalResults);
 }
 mWizard->nextPage();
-}
+OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_SELECTNEXTPAGEACTIONS_EXIT );
+}

changeset 43	72ebcbb64834
parent 39	7b3e49e4608a
child 49	fb81b597edf1