# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282117966 -10800 # Node ID d4198dcb998368ad70ea75fa372aaf0ff51c69a5 # Parent 2fbd1d709fe76d3c7bda4be4dfd09613b247dd7f Revision: 201031 Kit: 201033 diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/cpwlansettingsplugin/src/cpwlansettingsgroupitemdata.cpp --- a/wlanutilities/cpwlansettingsplugin/src/cpwlansettingsgroupitemdata.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/cpwlansettingsplugin/src/cpwlansettingsgroupitemdata.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -117,49 +117,54 @@ OstTraceFunctionEntry1(CPWLANSETTINGSGROUPITEMDATA_CREATEWLANSETTINITEMS_ENTRY, this); mJoinWlanItem = new CpSettingFormItemData( - HbDataFormModelItem::ComboBoxItem, hbTrId( - "txt_occ_setlabel_join_wlan_networks"), this); + HbDataFormModelItem::ComboBoxItem, + hbTrId("txt_occ_setlabel_join_wlan_networks")); // name the object for test automation purposes mJoinWlanItem->setObjectName("switchToWlan"); QStringList joinWlanItems; - joinWlanItems.append(hbTrId( - "txt_occ_setlabel_join_wlan_networks_val_known")); + joinWlanItems.append( + hbTrId("txt_occ_setlabel_join_wlan_networks_val_known")); - joinWlanItems.append(hbTrId( - "txt_occ_setlabel_join_wlan_networks_val_manual")); + joinWlanItems.append( + hbTrId("txt_occ_setlabel_join_wlan_networks_val_manual")); mJoinWlanItem->setContentWidgetData("items", joinWlanItems); - mItemDataHelper.addConnection(mJoinWlanItem, - SIGNAL(currentIndexChanged (int)), this, - SLOT(joinWlanItemChanged (int))); + mItemDataHelper.addConnection( + mJoinWlanItem, + SIGNAL(currentIndexChanged (int)), + this, + SLOT(joinWlanItemChanged (int))); - mJoinWlanItem->setContentWidgetData("currentIndex", - mWlanSettings->joinWlanMode()); + mJoinWlanItem->setContentWidgetData( + "currentIndex", + mWlanSettings->joinWlanMode()); this->appendChild(mJoinWlanItem); mScanNetworkItem = new CpSettingFormItemData( - HbDataFormModelItem::ComboBoxItem, hbTrId( - "txt_occ_setlabel_scan_for_networks"), this); + HbDataFormModelItem::ComboBoxItem, + hbTrId("txt_occ_setlabel_scan_for_networks")); // name the object for test automation purposes mScanNetworkItem->setObjectName("scanNetworkItem"); QStringList scanNetworkItems; - scanNetworkItems.append(hbTrId( - "txt_occ_setlabel_scan_for_networks_val_automatic")); + scanNetworkItems.append( + hbTrId("txt_occ_setlabel_scan_for_networks_val_automatic")); - scanNetworkItems.append(hbTrId( - "txt_occ_setlabel_scan_for_networks_val_userdefine")); + scanNetworkItems.append( + hbTrId("txt_occ_setlabel_scan_for_networks_val_userdefine")); mScanNetworkItem->setContentWidgetData("items", scanNetworkItems); - mItemDataHelper.addConnection(mScanNetworkItem, - SIGNAL(currentIndexChanged (const QString &)), this, - SLOT(scanItemChanged (const QString &))); + mItemDataHelper.addConnection( + mScanNetworkItem, + SIGNAL(currentIndexChanged (const QString &)), + this, + SLOT(scanItemChanged (const QString &))); this->appendChild(mScanNetworkItem); @@ -173,27 +178,30 @@ } mPowerSavingItem = new CpSettingFormItemData( - HbDataFormModelItem::ComboBoxItem, hbTrId( - "txt_occ_setlabel_power_saving"), this); + HbDataFormModelItem::ComboBoxItem, + hbTrId("txt_occ_setlabel_power_saving")); // name the object for test automation purposes mPowerSavingItem->setObjectName("powerSaving"); QStringList powerSavingItems; - powerSavingItems.append(hbTrId( - "txt_occ_setlabel_power_saving_val_disabled")); + powerSavingItems.append( + hbTrId("txt_occ_setlabel_power_saving_val_disabled")); - powerSavingItems.append(hbTrId( - "txt_occ_setlabel_power_saving_val_enabled")); + powerSavingItems.append( + hbTrId("txt_occ_setlabel_power_saving_val_enabled")); mPowerSavingItem->setContentWidgetData("items", powerSavingItems); - mPowerSavingItem->setContentWidgetData("currentIndex", - mWlanSettings->isPowerSavingEnabled()); + mPowerSavingItem->setContentWidgetData( + "currentIndex", + mWlanSettings->isPowerSavingEnabled()); - mItemDataHelper.addConnection(mPowerSavingItem, - SIGNAL(currentIndexChanged (int)), this, - SLOT(powerSavingItemChanged (int))); + mItemDataHelper.addConnection( + mPowerSavingItem, + SIGNAL(currentIndexChanged (int)), + this, + SLOT(powerSavingItemChanged (int))); this->appendChild(mPowerSavingItem); @@ -209,22 +217,31 @@ OstTraceFunctionEntry1(CPWLANSETTINGSGROUPITEMDATA_CREATESCANINTERVALITEM_ENTRY, this); mUserDefinedItem = new CpSettingFormItemData( - HbDataFormModelItem::SliderItem, hbTrId( - "txt_occ_setlabel_scan_interval_minutes"), this); + HbDataFormModelItem::SliderItem, + hbTrId("txt_occ_setlabel_scan_interval_minutes")); mUserDefinedItem->setContentWidgetData("maximum", KMaximumScanInterval); mUserDefinedItem->setContentWidgetData("minimum", KMinimumScanInterval); mUserDefinedItem->setContentWidgetData("toolTipVisible", KEnableOption); mUserDefinedItem->setContentWidgetData("tracking", KEnableOption); - mItemDataHelper.addConnection(mUserDefinedItem, - SIGNAL(valueChanged (int)), this, SLOT(scanValueChanged (int))); + mItemDataHelper.addConnection( + mUserDefinedItem, + SIGNAL(valueChanged (int)), + this, + SLOT(scanValueChanged (int))); - mItemDataHelper.addConnection(mUserDefinedItem, - SIGNAL(sliderReleased ()), this, SLOT(scanSliderReleased ())); + mItemDataHelper.addConnection( + mUserDefinedItem, + SIGNAL(sliderReleased ()), + this, + SLOT(scanSliderReleased ())); - mItemDataHelper.addConnection(mUserDefinedItem, SIGNAL(sliderPressed ()), - this, SLOT(scanSliderPressed ())); + mItemDataHelper.addConnection( + mUserDefinedItem, + SIGNAL(sliderPressed ()), + this, + SLOT(scanSliderPressed ())); mScanInterval = mWlanSettings->scanInterval(); diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizard_p.cpp --- a/wlanutilities/eapwizard/src/eapwizard_p.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizard_p.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -63,7 +63,7 @@ /*! Constructor of EAP Wizard. - + @param [in] wizardHelper pointer to the helper instance. */ EapWizardPrivate::EapWizardPrivate( @@ -74,8 +74,10 @@ EapQtConfigInterface::EapBearerTypeWlan, EapQtConfigInterface::IapIdUndefined)) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_EAPWIZARDPRIVATE_ENTRY ); Q_ASSERT(wizardHelper); createPages(); + OstTraceFunctionExit0( EAPWIZARDPRIVATE_EAPWIZARDPRIVATE_EXIT ); } /*! @@ -83,6 +85,8 @@ */ EapWizardPrivate::~EapWizardPrivate() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPRIVATE_EAPWIZARDPRIVATE_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPRIVATE_EAPWIZARDPRIVATE_EXIT ); } /*! @@ -93,6 +97,7 @@ QString &item, QString &value) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_SUMMARY_ENTRY ); bool ret = false; int outerType = configurations(EapWizardPrivate::OuterType).toInt(); @@ -121,77 +126,81 @@ break; } + OstTraceFunctionExit0( EAPWIZARDPRIVATE_SUMMARY_EXIT ); return ret; } /*! See EapWizard::storeSettings(). - + @return true - ok, false - failed */ bool EapWizardPrivate::storeSettings() { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_STORESETTINGS_ENTRY ); bool ret = false; EapQtPluginHandle outerType(static_cast( configurations(OuterType).toInt())); - + int iapId = mWizardHelper->configuration(WlanWizardHelper::ConfIapId).toInt(); - + if (mEapConfIf->setConfigurationReference(iapId) && storeOuterTypeSettings(outerType) && storeInnerTypeSettings(outerType)) { ret = true; } + OstTraceFunctionExit0( EAPWIZARDPRIVATE_STORESETTINGS_EXIT ); return ret; } /*! See WlanWizardPlugin::errorString(). - + Returns EAP spesific error string. */ QString EapWizardPrivate::errorString(int errorCode) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_ERRORSTRING_ENTRY ); char* textId = NULL; int eapType = EapQtPluginHandle::PluginUndefined; - + switch (errorCode){ case KErrWlanUserRejected: textId = "txt_occ_dialog_1_auth_failed_user_cert_rej"; eapType = configurations(OuterType).toInt(); break; - + case KErrWlanUserCertificateExpired: textId = "txt_occ_dialog_1_auth_failed_user_cert_exp"; eapType = configurations(OuterType).toInt(); break; - + case KErrWlanServerCertificateExpired: textId = "txt_occ_dialog_1_authentication_failed_server_ce"; eapType = configurations(OuterType).toInt(); break; - + case KErrWlanCerficateVerifyFailed: textId = "txt_occ_dialog_1_authentication_failed_could_not"; eapType = configurations(OuterType).toInt(); break; - + case KErrWlanNoCipherSuite: textId = "txt_occ_dialog_1_authentication_failed_cipher_su"; eapType = configurations(OuterType).toInt(); break; - + case KErrWlanSimNotInstalled: textId = "txt_occ_dialog_1_authentication_failed_check_sim"; eapType = configurations(OuterType).toInt(); break; - + case KErrWlanEapFastPacStoreCorrupted: textId = "txt_occ_dialog_1_authentication_failed_reset_pac"; eapType = EapQtPluginHandle::PluginEapFast; break; - + case KErrWlanEapSimFailed: case KErrWlanEapTlsFailed: case KErrWlanEapPeapFailed: @@ -207,13 +216,13 @@ textId = "txt_occ_dialog_1_authentication_failed"; eapType = configurations(OuterType).toInt(); break; - + case KErrWlanEapMsChapv2: case KErrWlanEapGtcFailed: textId = "txt_occ_dialog_1_authentication_failed"; eapType = configurations(InnerType).toInt(); break; - + case KErrWlanNotSubscribed: case KErrWlanAccessBarred: case KErrWlanPasswordExpired: @@ -227,65 +236,69 @@ eapType = configurations(OuterType).toInt(); } break; - + default: // Return empty string break; } - + QString string; if (textId) { - string = HbParameterLengthLimiter(hbTrId(textId)).arg(eapTypeToString(eapType)); + string = HbParameterLengthLimiter(textId).arg(eapTypeToString(eapType)); } - + + OstTraceFunctionExit0( EAPWIZARDPRIVATE_ERRORSTRING_EXIT ); return string; } /*! Reader method for eap configurations. - + See ConfigurationId for further details about the data types in QVariant. - + @param [in] confId Defines what configuration is read. - + @return configuration value. */ QVariant EapWizardPrivate::configurations(ConfigurationId confId) const { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_CONFIGURATIONS_ENTRY ); Q_ASSERT(mConfigurations.contains(confId)); - + #ifdef OST_TRACE_COMPILER_IN_USE QString tmp; QDebug tmpStream(&tmp ); tmpStream << mConfigurations[confId]; TPtrC16 string(tmp.utf16(), tmp.length() ); - + OstTraceExt2( TRACE_NORMAL, EAPWIZARDPRIVATE_CONFIGURATIONS, "EapWizardPrivate::configurations;confId=%{ConfigurationId};string=%S", (TUint)confId, string ); #endif - + + OstTraceFunctionExit0( EAPWIZARDPRIVATE_CONFIGURATIONS_EXIT ); return mConfigurations[confId]; } /*! Sets EAP configuration value for given configuration identifier. See ConfigurationId for further details about the data types in QVariant. - + @param [in] confId Configuration Identifier do to be set @param [in] value Value for configuration. */ void EapWizardPrivate::setConfigurations( ConfigurationId confId, const QVariant &value) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_SETCONFIGURATIONS_ENTRY ); #ifdef OST_TRACE_COMPILER_IN_USE QString tmp; QDebug tmpStream(&tmp ); tmpStream << value; TPtrC16 string( tmp.utf16(), tmp.length() ); - + OstTraceExt2( TRACE_NORMAL, EAPWIZARDPRIVATE_SETCONFIGURATIONS, @@ -294,6 +307,7 @@ #endif mConfigurations[confId] = value; + OstTraceFunctionExit0( EAPWIZARDPRIVATE_SETCONFIGURATIONS_EXIT ); } /*! @@ -301,79 +315,85 @@ */ EapQtConfigInterface* EapWizardPrivate::eapConfigurationInterface() const { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_EAPCONFIGURATIONINTERFACE_ENTRY ); Q_ASSERT(mEapConfIf.data()); + OstTraceFunctionExit0( EAPWIZARDPRIVATE_EAPCONFIGURATIONINTERFACE_EXIT ); return mEapConfIf.data(); } /*! Maps given EAP Qt Plugin handle into string. - + @param [in] id EapQtPluginHandle::Handle, id to be mapped to string. - + @return EAP String. */ QString EapWizardPrivate::eapTypeToString(int id) const { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_EAPTYPETOSTRING_ENTRY ); QString locId; switch (id) { case EapQtPluginHandle::PluginEapAka: locId = EapWizardUiStrings::EapAka; break; - + case EapQtPluginHandle::PluginEapFast: locId = EapWizardUiStrings::EapFast; break; - + case EapQtPluginHandle::PluginLeap: locId = EapWizardUiStrings::Leap; break; - + case EapQtPluginHandle::PluginPeap: locId = EapWizardUiStrings::Peap; break; - + case EapQtPluginHandle::PluginEapSim: locId = EapWizardUiStrings::EapSim; break; - + case EapQtPluginHandle::PluginEapTls: locId = EapWizardUiStrings::EapTls; break; - + case EapQtPluginHandle::PluginEapTtls: locId = EapWizardUiStrings::EapTtls; break; - + case EapQtPluginHandle::PluginEapMschapv2: locId = EapWizardUiStrings::EapMschapv2; break; - + case EapQtPluginHandle::PluginEapGtc: locId = EapWizardUiStrings::EapGtc; break; - + case EapQtPluginHandle::PluginPap: locId = EapWizardUiStrings::Pap; break; - + default: // Invalid enum Q_ASSERT(EapQtPluginHandle::PluginPlainMschapv2 == id); locId = EapWizardUiStrings::Mschapv2; break; } - + + OstTraceFunctionExit0( EAPWIZARDPRIVATE_EAPTYPETOSTRING_EXIT ); return locId; } /*! Accessor to WLAN Wizard Helper objects. - + @return a pointer to helper object. */ WlanWizardHelper *EapWizardPrivate::wizardHelper() const { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_WIZARDHELPER_ENTRY ); Q_ASSERT(mWizardHelper); + OstTraceFunctionExit0( EAPWIZARDPRIVATE_WIZARDHELPER_EXIT ); return mWizardHelper; } @@ -382,74 +402,78 @@ */ void EapWizardPrivate::createPages() { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_CREATEPAGES_ENTRY ); mWizardHelper->addPage( EapWizardPage::PageOuterType, new EapWizardPageOuterType(this)); - + mWizardHelper->addPage( EapWizardPage::PageCertificateCa, new EapWizardPageCertCa(this)); - + mWizardHelper->addPage( EapWizardPage::PageCertificateUser, new EapWizardPageCertUser(this)); - + mWizardHelper->addPage( EapWizardPage::PageIdentity, new EapWizardPageIdentity(this)); - + mWizardHelper->addPage( EapWizardPage::PageInnerTypeEapTtls, new EapWizardPageInnerType( this, EapQtPluginHandle::PluginEapTtls)); - + mWizardHelper->addPage( EapWizardPage::PageInnerTypePeap, new EapWizardPageInnerType( this, EapQtPluginHandle::PluginPeap)); - + mWizardHelper->addPage( EapWizardPage::PageUsernamePassword, new EapWizardPageUsernamePassword(this)); - + mWizardHelper->addPage( EapWizardPage::PageNewPacStorePassword, new EapWizardPageNewPacStore(this)); - + mWizardHelper->addPage( EapWizardPage::PagePromptPacStorePassword, new EapWizardPagePacStorePasswordConfirm(this)); + OstTraceFunctionExit0( EAPWIZARDPRIVATE_CREATEPAGES_EXIT ); } /*! Check whether selected outer type has inner method. - + @return true if inner method exists, false otherwise. */ bool EapWizardPrivate::hasInnerMethod() const { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_HASINNERMETHOD_ENTRY ); int outerType = configurations(EapWizardPrivate::OuterType).toInt(); bool ret = false; - - switch (outerType){ + + switch (outerType) { case EapQtPluginHandle::PluginEapTtls: case EapQtPluginHandle::PluginPeap: case EapQtPluginHandle::PluginEapFast: ret = true; break; } - + + OstTraceFunctionExit0( EAPWIZARDPRIVATE_HASINNERMETHOD_EXIT ); return ret; } /* Handles TLS methods (PEAP, EAP-TLS and EAP-TTLS) settings. - + Stores configurations to eapConf - + @param [in,out] eapConf configuration is written to this object. @param [in] outerType Outer EAP method */ @@ -457,6 +481,7 @@ EapQtConfig &eapConf, EapQtPluginHandle &outerType) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_HANDLETLSMETHODSSETTINGS_ENTRY ); // Common stuff for all tls methods eapConf.setValue(EapQtConfig::UseIdentityPrivacy, false); eapConf.setValue(EapQtConfig::VerifyServerRealm, false); @@ -465,9 +490,9 @@ eapConf.setValue(EapQtConfig::Username, configurations(TunnelUsername)); eapConf.setValue(EapQtConfig::RealmAutomatic, configurations(TunnelRealmAutomatic)); eapConf.setValue(EapQtConfig::Realm, configurations(TunnelRealm)); - + QVariant certVariant = configurations(CertificateCa); - + if (certVariant.canConvert ()) { QList caCerts; caCerts.append(certVariant); @@ -476,23 +501,23 @@ } else { eapConf.setValue(EapQtConfig::AuthorityCertificateAutomatic, true); } - + // type specific configurations if (outerType == EapQtPluginHandle::PluginEapTls) { QList userCerts; userCerts.append(configurations(CertificateUser)); eapConf.setValue(EapQtConfig::ClientAuthenticationRequired, true); eapConf.setValue(EapQtConfig::UserCertificate, userCerts); - + } else if (outerType == EapQtPluginHandle::PluginPeap) { - + switch (configurations(InnerType).toInt()) { case EapQtPluginHandle::PluginEapMschapv2: // EAP-MSCHAPv2: enable v0 only eapConf.setValue(EapQtConfig::PeapVersion0Allowed, true); eapConf.setValue(EapQtConfig::PeapVersion1Allowed, false); break; - + case EapQtPluginHandle::PluginEapGtc: // EAP-GTC: enable v1 only eapConf.setValue(EapQtConfig::PeapVersion0Allowed, false); @@ -501,20 +526,22 @@ } eapConf.setValue(EapQtConfig::PeapVersion2Allowed, false); } + OstTraceFunctionExit0( EAPWIZARDPRIVATE_HANDLETLSMETHODSSETTINGS_EXIT ); } /*! Handles configurations for EAP-FAST. - + @param [in,out] eapConf EAP Configuration - + @param false in case of failure. */ bool EapWizardPrivate::handleEapFastSettings(EapQtConfig &eapConf) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_HANDLEEAPFASTSETTINGS_ENTRY ); bool ret = true; EapQtPacStoreConfig pacStoreConf; - + eapConf.setValue(EapQtConfig::ProvisioningModeAuthenticated, false); eapConf.setValue(EapQtConfig::ProvisioningModeUnauthenticated, true); eapConf.setValue(EapQtConfig::VerifyServerRealm, false); @@ -526,60 +553,66 @@ pacStoreConf.setValue( EapQtPacStoreConfig::PacStorePassword, configurations(PacStorePassword)); - + pacStoreConf.setValue( EapQtPacStoreConfig::PacStoreSavePassword, true); - + if (!mEapConfIf->savePacStoreConfiguration(pacStoreConf)) { // no cleaning required ret = false; } break; - + default: // Do nothing break; } - + + OstTraceFunctionExit0( EAPWIZARDPRIVATE_HANDLEEAPFASTSETTINGS_EXIT ); return ret; } /*! Handles configurations for EAP-AKA and EAP-SIM. - + @param [in,out] eapConf EAP Configuration */ void EapWizardPrivate::handleEapAkaSimSettings(EapQtConfig &eapConf) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_HANDLEEAPAKASIMSETTINGS_ENTRY ); eapConf.setValue(EapQtConfig::UsernameAutomatic, true); eapConf.setValue(EapQtConfig::RealmAutomatic, true); + OstTraceFunctionExit0( EAPWIZARDPRIVATE_HANDLEEAPAKASIMSETTINGS_EXIT ); } /*! Handles configurations for LEAP. - + @param [in,out] eapConf EAP Configuration */ void EapWizardPrivate::handleLeapSettings(EapQtConfig &eapConf) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_HANDLELEAPSETTINGS_ENTRY ); eapConf.setValue(EapQtConfig::UsernameAutomatic, false); eapConf.setValue(EapQtConfig::Username, configurations(Username)); eapConf.setValue(EapQtConfig::PasswordPrompt, false); eapConf.setValue(EapQtConfig::Password, configurations(Password)); + OstTraceFunctionExit0( EAPWIZARDPRIVATE_HANDLELEAPSETTINGS_EXIT ); } /*! Store outer type settings. - + @param outerType reference to outertype - + @return false in case of failure. */ bool EapWizardPrivate::storeOuterTypeSettings(EapQtPluginHandle &outerType) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_STOREOUTERTYPESETTINGS_ENTRY ); EapQtConfig eapConf; - + // 1. Store outer type settings switch (outerType.pluginId()) { case EapQtPluginHandle::PluginEapTtls: @@ -587,65 +620,70 @@ case EapQtPluginHandle::PluginEapTls: handleTlsMethodsSettings(eapConf, outerType); break; - + case EapQtPluginHandle::PluginEapFast: if (!handleEapFastSettings(eapConf)) { + OstTraceFunctionExit0( EAPWIZARDPRIVATE_STOREOUTERTYPESETTINGS_EXIT ); return false; } break; - + case EapQtPluginHandle::PluginEapAka: case EapQtPluginHandle::PluginEapSim: handleEapAkaSimSettings(eapConf); break; - + default: Q_ASSERT(outerType == EapQtPluginHandle::PluginLeap); handleLeapSettings(eapConf); break; } - + if (hasInnerMethod()) { EapQtPluginHandle inner = static_cast( configurations(InnerType).toInt()); - + QList innerType; innerType.append(qVariantFromValue(inner)); eapConf.setValue(EapQtConfig::InnerType, innerType); } - + // store outer type configurations if (!mEapConfIf->saveConfiguration(outerType, eapConf)){ mEapConfIf->deleteConfiguration(); + OstTraceFunctionExit0( DUP1_EAPWIZARDPRIVATE_STOREOUTERTYPESETTINGS_EXIT ); return false; } - + QList selectedOuterTypes; selectedOuterTypes.append(outerType); if (!mEapConfIf->setSelectedOuterTypes(selectedOuterTypes)){ mEapConfIf->deleteConfiguration(); + OstTraceFunctionExit0( DUP2_EAPWIZARDPRIVATE_STOREOUTERTYPESETTINGS_EXIT ); return false; } - + + OstTraceFunctionExit0( DUP3_EAPWIZARDPRIVATE_STOREOUTERTYPESETTINGS_EXIT ); return true; } /*! Store inner type settings if exists. - + @param outerType reference to outertype - + @return false in case of failure. */ bool EapWizardPrivate::storeInnerTypeSettings(EapQtPluginHandle &outerType) { + OstTraceFunctionEntry0( EAPWIZARDPRIVATE_STOREINNERTYPESETTINGS_ENTRY ); bool ret = true; - + if (hasInnerMethod()) { EapQtPluginHandle inner = static_cast( configurations(InnerType).toInt()); - + // All inner methods supported by wizard use password / username. EapQtConfig eapConfInner; eapConfInner.setValue(EapQtConfig::OuterType, qVariantFromValue(outerType)); @@ -653,11 +691,12 @@ eapConfInner.setValue(EapQtConfig::Username, configurations(Username)); eapConfInner.setValue(EapQtConfig::PasswordPrompt, false); eapConfInner.setValue(EapQtConfig::Password, configurations(Password)); - + if (!mEapConfIf->saveConfiguration(inner, eapConfInner)){ mEapConfIf->deleteConfiguration(); ret = false; } } + OstTraceFunctionExit0( EAPWIZARDPRIVATE_STOREINNERTYPESETTINGS_EXIT ); return ret; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpage.cpp --- a/wlanutilities/eapwizard/src/eapwizardpage.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpage.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -24,6 +24,11 @@ // User includes #include "eapwizardpage.h" #include "eapwizard_p.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpageTraces.h" +#endif + /*! \class EapWizardPage @@ -51,13 +56,15 @@ /*! Constructor. - + @param [in] parent Pointer to EAP Wizard private implementation. */ EapWizardPage::EapWizardPage(EapWizardPrivate* parent) : QObject(parent), mWizard(parent) { + OstTraceFunctionEntry0( EAPWIZARDPAGE_EAPWIZARDPAGE_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGE_EAPWIZARDPAGE_EXIT ); } /*! @@ -65,7 +72,9 @@ */ EapWizardPage::~EapWizardPage() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGE_EAPWIZARDPAGE_ENTRY ); mWizard = NULL; + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGE_EAPWIZARDPAGE_EXIT ); } /*! @@ -73,13 +82,15 @@ */ int EapWizardPage::nextId(bool &removeFromStack) const { + OstTraceFunctionEntry0( EAPWIZARDPAGE_NEXTID_ENTRY ); removeFromStack = false; + OstTraceFunctionExit0( EAPWIZARDPAGE_NEXTID_EXIT ); return nextId(); } /*! Loads requested section from given docml file. - + @param [in] loader Document loader for docml @param [in] orientation Orientation to be loaded @param [in] filename the name of docml filename @@ -93,8 +104,9 @@ const QString &portraitSection, const QString &landscapeSection) const { + OstTraceFunctionEntry0( EAPWIZARDPAGE_LOADDOCMLSECTION_ENTRY ); bool ok; - + // Then load the orientation specific section if (orientation == Qt::Horizontal) { loader->load(filename, landscapeSection, &ok); @@ -104,4 +116,5 @@ loader->load(filename, portraitSection, &ok); Q_ASSERT(ok); } + OstTraceFunctionExit0( EAPWIZARDPAGE_LOADDOCMLSECTION_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpagecertca.cpp --- a/wlanutilities/eapwizard/src/eapwizardpagecertca.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpagecertca.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -31,6 +31,11 @@ #include "wlanwizardhelper.h" #include "eapwizard_p.h" #include "eapwizardpagecertca.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpagecertcaTraces.h" +#endif + /*! \class EapWizardPageCertCa @@ -48,7 +53,7 @@ /*! Constructor. - + @param [in] parent Pointer to EAP Wizard private implementation. */ EapWizardPageCertCa::EapWizardPageCertCa(EapWizardPrivate* parent) : @@ -58,6 +63,8 @@ mTitle(NULL), mCertList(NULL) { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTCA_EAPWIZARDPAGECERTCA_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGECERTCA_EAPWIZARDPAGECERTCA_EXIT ); } /*! @@ -65,6 +72,8 @@ */ EapWizardPageCertCa::~EapWizardPageCertCa() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGECERTCA_EAPWIZARDPAGECERTCA_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGECERTCA_EAPWIZARDPAGECERTCA_EXIT ); } /*! @@ -72,16 +81,17 @@ */ HbWidget* EapWizardPageCertCa::initializePage() { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTCA_INITIALIZEPAGE_ENTRY ); if (!mWidget) { mDocumentLoader.reset( new HbDocumentLoader( mWizard->wizardHelper()->mainWindow()) ); - + bool ok; mDocumentLoader->load(":/docml/occ_eap_wizard_01_02_04.docml", &ok); Q_ASSERT(ok); - + loadDocmlSection(mWizard->wizardHelper()->mainWindow()->orientation()); - + mWidget = qobject_cast ( mDocumentLoader->findWidget("occ_eap_wizard_01")); Q_ASSERT(mWidget); @@ -89,13 +99,13 @@ mCertList = qobject_cast ( mDocumentLoader->findWidget("list")); Q_ASSERT(mCertList); - + mTitle = qobject_cast (mDocumentLoader->findWidget("title")); Q_ASSERT(mTitle); - + mTitle->setPlainText( hbTrId("txt_occ_title_select_authority_certificate")); - + ok = connect( mWizard->wizardHelper()->mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), @@ -103,7 +113,7 @@ SLOT(loadDocmlSection(Qt::Orientation))); Q_ASSERT(ok); } - + EapQtConfigInterface* confIf = mWizard->eapConfigurationInterface(); // ignore return value confIf->updateCertificates(); @@ -112,15 +122,15 @@ QStringList list; list << hbTrId("txt_occ_setlabel_val_select_automatically"); - for (int i = 0; i < mCerts.count(); ++i) { - // TODO: workaround for BBHA-863EJN - // graphics memory runs out for long lists and items - QString tmp(mCerts.at(i).value( - EapQtCertificateInfo::CertificateLabel).toString()); - tmp.truncate(10); - list << tmp; + for (int i = 0; i < mCerts.count(); ++i) { + // TODO: workaround for BBHA-863EJN + // graphics memory runs out for long lists and items + QString tmp(mCerts.at(i).value( + EapQtCertificateInfo::CertificateLabel).toString()); + tmp.truncate(10); + list << tmp; } - + // If certificate list has been changed update the content otherwise do not // change it if (list != mCertList->items()) { @@ -128,33 +138,37 @@ // Automatic is selected by default mCertList->setSelected(IndexForAutomatic); } + OstTraceFunctionExit0( EAPWIZARDPAGECERTCA_INITIALIZEPAGE_EXIT ); return mWidget; } /*! Loads the required orientation of docml. - + @param [in] orientation Orientation to be loaded. */ void EapWizardPageCertCa::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTCA_LOADDOCMLSECTION_ENTRY ); EapWizardPage::loadDocmlSection( mDocumentLoader.data(), orientation, ":/docml/occ_eap_wizard_01_02_04.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( EAPWIZARDPAGECERTCA_LOADDOCMLSECTION_EXIT ); } /*! See WlanWizardPage. - + @return next wizard page: - EapWizardPage::PageCertificateUser: For EAP-TLS - EapWizardPage::PageIdentity: For EAP-TTLS and PEAP */ int EapWizardPageCertCa::nextId() const { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTCA_NEXTID_ENTRY ); int id = WlanWizardPage::PageNone; bool ok; int type = mWizard->configurations(EapWizardPrivate::OuterType).toInt(&ok); @@ -177,5 +191,6 @@ selected - AmountOfNonCertItems))); } + OstTraceFunctionExit0( EAPWIZARDPAGECERTCA_NEXTID_EXIT ); return id; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpagecertuser.cpp --- a/wlanutilities/eapwizard/src/eapwizardpagecertuser.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpagecertuser.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -30,6 +30,11 @@ #include "wlanwizardhelper.h" #include "eapwizardpagecertuser.h" #include "eapwizard_p.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpagecertuserTraces.h" +#endif + /*! \class EapWizardPageCertUser @@ -47,7 +52,7 @@ /*! Constructor. - + @param [in] parent Pointer to EAP Wizard private implementation. */ @@ -59,6 +64,8 @@ mDocumentLoader(NULL), mValid(false) { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTUSER_EAPWIZARDPAGECERTUSER_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGECERTUSER_EAPWIZARDPAGECERTUSER_EXIT ); } /*! @@ -66,6 +73,8 @@ */ EapWizardPageCertUser::~EapWizardPageCertUser() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGECERTUSER_EAPWIZARDPAGECERTUSER_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGECERTUSER_EAPWIZARDPAGECERTUSER_EXIT ); } /*! @@ -73,13 +82,14 @@ */ HbWidget* EapWizardPageCertUser::initializePage() { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTUSER_INITIALIZEPAGE_ENTRY ); if (!mWidget) { bool ok; mDocumentLoader.reset(new HbDocumentLoader(mWizard->wizardHelper()->mainWindow())); mDocumentLoader->load(":/docml/occ_eap_wizard_06.docml", &ok); Q_ASSERT(ok); loadDocmlSection(mWizard->wizardHelper()->mainWindow()->orientation()); - + mWidget = qobject_cast (mDocumentLoader->findWidget("occ_eap_wizard_06")); Q_ASSERT(mWidget); @@ -97,7 +107,7 @@ this, SLOT(loadDocmlSection(Qt::Orientation))); Q_ASSERT(ok); - + ok = connect( mCertList, SIGNAL(itemSelected(int)), this, SLOT(itemSelected(int))); @@ -123,7 +133,7 @@ mCertList->setItems(list); mErrorLabel->setVisible(false); mCertList->setVisible(true); - + if (list.count() == 1) { mValid = true; mCertList->setSelected(0); @@ -131,60 +141,69 @@ mValid = false; } } + OstTraceFunctionExit0( EAPWIZARDPAGECERTUSER_INITIALIZEPAGE_EXIT ); return mWidget; } /*! Loads the required orientation of docml. - + @param [in] orientation Orientation to be loaded. */ void EapWizardPageCertUser::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTUSER_LOADDOCMLSECTION_ENTRY ); EapWizardPage::loadDocmlSection( mDocumentLoader.data(), orientation, ":/docml/occ_eap_wizard_06.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( EAPWIZARDPAGECERTUSER_LOADDOCMLSECTION_EXIT ); } /*! See WlanWizardPage. - + @return next wizard page: EapWizardPage::PageIdentity */ int EapWizardPageCertUser::nextId() const { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTUSER_NEXTID_ENTRY ); mWizard->setConfigurations( EapWizardPrivate::CertificateUser, qVariantFromValue( mCerts.at(mCertList->selected()))); + OstTraceFunctionExit0( EAPWIZARDPAGECERTUSER_NEXTID_EXIT ); return EapWizardPage::PageIdentity; } /*! See WlanWizardPage. - + Validates the content of the page. - + @return true if content is valid. */ bool EapWizardPageCertUser::showPage() { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTUSER_SHOWPAGE_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGECERTUSER_SHOWPAGE_EXIT ); return mValid; } /*! Handler for itemsSelected() signal from HbRadioButtonList. - + @param [in] index NOT USED */ void EapWizardPageCertUser::itemSelected(int index) { + OstTraceFunctionEntry0( EAPWIZARDPAGECERTUSER_ITEMSELECTED_ENTRY ); Q_UNUSED(index); mValid = true; mWizard->wizardHelper()->enableNextButton(mValid); + OstTraceFunctionExit0( EAPWIZARDPAGECERTUSER_ITEMSELECTED_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpageidentity.cpp --- a/wlanutilities/eapwizard/src/eapwizardpageidentity.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpageidentity.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -35,6 +35,11 @@ #include "wlanwizardhelper.h" #include "eapwizardpageidentity.h" #include "eapwizard_p.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpageidentityTraces.h" +#endif + /*! \class EapWizardPageIdentity @@ -52,7 +57,7 @@ /*! Constructor. - + @param [in] parent Pointer to EAP Wizard private implementation. */ EapWizardPageIdentity::EapWizardPageIdentity(EapWizardPrivate* parent) : @@ -68,6 +73,8 @@ mLabelRealm(NULL), mLabelUsername(NULL) { + OstTraceFunctionEntry0( EAPWIZARDPAGEIDENTITY_EAPWIZARDPAGEIDENTITY_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGEIDENTITY_EAPWIZARDPAGEIDENTITY_EXIT ); } /*! @@ -75,6 +82,8 @@ */ EapWizardPageIdentity::~EapWizardPageIdentity() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGEIDENTITY_EAPWIZARDPAGEIDENTITY_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGEIDENTITY_EAPWIZARDPAGEIDENTITY_EXIT ); } /*! @@ -82,6 +91,7 @@ */ HbWidget* EapWizardPageIdentity::initializePage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEIDENTITY_INITIALIZEPAGE_ENTRY ); if (!mWidget) { bool ok = true; mDocumentLoader.reset( @@ -90,7 +100,7 @@ Q_ASSERT(ok); loadDocmlSection(mWizard->wizardHelper()->mainWindow()->orientation()); - + mWidget = qobject_cast (mDocumentLoader->findWidget("occ_eap_wizard_03")); Q_ASSERT(mWidget); @@ -105,35 +115,35 @@ mCheckRealm = qobject_cast (mDocumentLoader->findWidget("setlabel_54_val")); Q_ASSERT(mCheckRealm); - + mLabelUsername = qobject_cast (mDocumentLoader->findWidget("setlabel_53")); Q_ASSERT(mLabelUsername); - + mLabelRealm = qobject_cast (mDocumentLoader->findWidget("setlabel_54")); Q_ASSERT(mLabelRealm); - + ok = connect( mWizard->wizardHelper()->mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(loadDocmlSection(Qt::Orientation))); Q_ASSERT(ok); - + ok = connect( mEditUsername, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); Q_ASSERT(ok); - + ok = connect( mEditRealm, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); Q_ASSERT(ok); - + ok = connect( mCheckUsername, SIGNAL(stateChanged(int)), this, SLOT(stateChanged(int))); Q_ASSERT(ok); - + ok = connect( mCheckRealm, SIGNAL(stateChanged(int)), this, SLOT(stateChanged(int))); @@ -144,10 +154,9 @@ mWizard->configurations(EapWizardPrivate::OuterType).toInt() ); mLabelUsername->setPlainText( - HbParameterLengthLimiter( - hbTrId("txt_occ_setlabel_user_name_for_1")).arg( - mWizard->eapTypeToString(plugin.pluginId()))); - + HbParameterLengthLimiter("txt_occ_setlabel_user_name_for_1").arg( + mWizard->eapTypeToString(plugin.pluginId()))); + // Configure editors properties mValidatorUsername.reset( mWizard->eapConfigurationInterface()->validatorEap( @@ -163,27 +172,30 @@ Q_ASSERT(mValidatorRealm.data()); mValidatorRealm->updateEditor(mEditRealm); + OstTraceFunctionExit0( EAPWIZARDPAGEIDENTITY_INITIALIZEPAGE_EXIT ); return mWidget; } /*! Loads the required orientation of docml. - + @param [in] orientation Orientation to be loaded. */ void EapWizardPageIdentity::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( EAPWIZARDPAGEIDENTITY_LOADDOCMLSECTION_ENTRY ); EapWizardPage::loadDocmlSection( mDocumentLoader.data(), orientation, ":/docml/occ_eap_wizard_03.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( EAPWIZARDPAGEIDENTITY_LOADDOCMLSECTION_EXIT ); } /*! See WlanWizardPage. - + @return next wizard page: - WlanWizardPage::PageProcessSettings: For EAP-TLS - EapWizardPage::PageInnerTypeEapTtls: For EAP-TTLS @@ -191,6 +203,7 @@ */ int EapWizardPageIdentity::nextId() const { + OstTraceFunctionEntry0( EAPWIZARDPAGEIDENTITY_NEXTID_ENTRY ); int id = WlanWizardPage::PageNone; bool ok; int type = mWizard->configurations(EapWizardPrivate::OuterType).toInt(&ok); @@ -200,11 +213,11 @@ case EapQtPluginHandle::PluginEapTls: id = WlanWizardPage::PageProcessSettings; break; - + case EapQtPluginHandle::PluginEapTtls: id = EapWizardPage::PageInnerTypeEapTtls; break; - + case EapQtPluginHandle::PluginPeap: id = EapWizardPage::PageInnerTypePeap; break; @@ -212,27 +225,29 @@ mWizard->setConfigurations(EapWizardPrivate::TunnelUsernameAutomatic, mCheckUsername->isChecked()); - + mWizard->setConfigurations( EapWizardPrivate::TunnelUsername, mEditUsername->text()); - + mWizard->setConfigurations( EapWizardPrivate::TunnelRealmAutomatic, mCheckRealm->isChecked()); - + mWizard->setConfigurations(EapWizardPrivate::TunnelRealm, mEditRealm->text()); + OstTraceFunctionExit0( EAPWIZARDPAGEIDENTITY_NEXTID_EXIT ); return id; } /*! See WlanWizardPage. - + Validates the content of the page. - + @return true if content is valid. */ bool EapWizardPageIdentity::showPage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEIDENTITY_SHOWPAGE_ENTRY ); bool valid = false; if (validateGroup(mEditUsername, mCheckUsername, mValidatorUsername.data()) && @@ -240,42 +255,47 @@ valid = true; } + OstTraceFunctionExit0( EAPWIZARDPAGEIDENTITY_SHOWPAGE_EXIT ); return valid; } /*! Slot for textChanged() signal from HbLineEdit. - + @param [in] text NOT USED. */ void EapWizardPageIdentity::textChanged(const QString & text) { + OstTraceFunctionEntry0( EAPWIZARDPAGEIDENTITY_TEXTCHANGED_ENTRY ); Q_UNUSED(text); mWizard->wizardHelper()->enableNextButton(showPage()); + OstTraceFunctionExit0( EAPWIZARDPAGEIDENTITY_TEXTCHANGED_EXIT ); } /*! Slot for stateChanged() signal from HbCheckBox. - + @param [in] state NOT USED. */ void EapWizardPageIdentity::stateChanged(int state ) { + OstTraceFunctionEntry0( EAPWIZARDPAGEIDENTITY_STATECHANGED_ENTRY ); Q_UNUSED(state); mEditUsername->setEnabled(!mCheckUsername->isChecked()); mEditRealm->setEnabled(!mCheckRealm->isChecked()); mWizard->wizardHelper()->enableNextButton(showPage()); + OstTraceFunctionExit0( EAPWIZARDPAGEIDENTITY_STATECHANGED_EXIT ); } /*! Validates the settings group, that is line edit and checkbox using given validator. - + @param [in] edit pointer to line edit to which content must be validated @param [in] checkBox pointer to checkbox @param [in] validator pointer to validator which is used to validate the content of the line editor. - + @return true if validation is ok, false otherwise. */ bool EapWizardPageIdentity::validateGroup( @@ -283,11 +303,13 @@ HbCheckBox *checkBox, EapQtValidator *validator) const { + OstTraceFunctionEntry0( EAPWIZARDPAGEIDENTITY_VALIDATEGROUP_ENTRY ); bool status = false; if (checkBox->isChecked() || checkBox->isChecked() == false && EapQtValidator::StatusOk == validator->validate(edit->text())) { status = true; } + OstTraceFunctionExit0( EAPWIZARDPAGEIDENTITY_VALIDATEGROUP_EXIT ); return status; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpageinnertype.cpp --- a/wlanutilities/eapwizard/src/eapwizardpageinnertype.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpageinnertype.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -31,6 +31,11 @@ #include "wlanwizardhelper.h" #include "eapwizardpageinnertype.h" #include "eapwizard_p.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpageinnertypeTraces.h" +#endif + /*! @@ -49,7 +54,7 @@ /*! Constructor. - + @param [in] parent Pointer to EAP Wizard private implementation. @param [in] outerType Identifies the outer type: Peap or EapTtls */ @@ -63,6 +68,8 @@ mOuterType(outerType), mValid(false) { + OstTraceFunctionEntry0( EAPWIZARDPAGEINNERTYPE_EAPWIZARDPAGEINNERTYPE_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGEINNERTYPE_EAPWIZARDPAGEINNERTYPE_EXIT ); } /*! @@ -70,6 +77,8 @@ */ EapWizardPageInnerType::~EapWizardPageInnerType() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGEINNERTYPE_EAPWIZARDPAGEINNERTYPE_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGEINNERTYPE_EAPWIZARDPAGEINNERTYPE_EXIT ); } /*! @@ -77,6 +86,7 @@ */ HbWidget* EapWizardPageInnerType::initializePage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEINNERTYPE_INITIALIZEPAGE_ENTRY ); if (!mWidget) { bool ok; mDocumentLoader.reset( @@ -85,7 +95,7 @@ Q_ASSERT(ok); loadDocmlSection(mWizard->wizardHelper()->mainWindow()->orientation()); - + mWidget = qobject_cast (mDocumentLoader->findWidget("occ_eap_wizard_01")); Q_ASSERT(mWidget); @@ -94,20 +104,20 @@ mRadio = qobject_cast (mDocumentLoader->findWidget("list")); Q_ASSERT(mRadio); - + ok = connect( mWizard->wizardHelper()->mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(loadDocmlSection(Qt::Orientation))); Q_ASSERT(ok); - + QStringList list; switch (mOuterType){ case EapQtPluginHandle::PluginPeap: appendToList(list, EapQtPluginHandle::PluginEapMschapv2); break; - + default: Q_ASSERT(mOuterType == EapQtPluginHandle::PluginEapTtls); appendToList(list, EapQtPluginHandle::PluginPlainMschapv2); @@ -116,77 +126,85 @@ } appendToList(list, EapQtPluginHandle::PluginEapGtc); mRadio->setItems(list); - + ok = connect(mRadio, SIGNAL(itemSelected(int)), this, SLOT(itemSelected(int))); Q_ASSERT(ok); } mTitle->setPlainText( - HbParameterLengthLimiter( - hbTrId("txt_occ_title_select_innear_eap_type_for_1")).arg( - mWizard->eapTypeToString( - mWizard->configurations( - EapWizardPrivate::OuterType).toInt()))); + HbParameterLengthLimiter("txt_occ_title_select_innear_eap_type_for_1").arg( + mWizard->eapTypeToString( + mWizard->configurations( + EapWizardPrivate::OuterType).toInt()))); + OstTraceFunctionExit0( EAPWIZARDPAGEINNERTYPE_INITIALIZEPAGE_EXIT ); return mWidget; } /*! Loads the required orientation of docml. - + @param [in] orientation Orientation to be loaded. */ void EapWizardPageInnerType::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( EAPWIZARDPAGEINNERTYPE_LOADDOCMLSECTION_ENTRY ); EapWizardPage::loadDocmlSection( mDocumentLoader.data(), orientation, ":/docml/occ_eap_wizard_01_02_04.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( EAPWIZARDPAGEINNERTYPE_LOADDOCMLSECTION_EXIT ); } /*! See WlanWizardPage. - + @return next wizard page: EapWizardPage::PageUsernamePassword */ int EapWizardPageInnerType::nextId() const { + OstTraceFunctionEntry0( EAPWIZARDPAGEINNERTYPE_NEXTID_ENTRY ); mWizard->setConfigurations( EapWizardPrivate::InnerType, mEapTypes.at(mRadio->selected())); - + + OstTraceFunctionExit0( EAPWIZARDPAGEINNERTYPE_NEXTID_EXIT ); return EapWizardPage::PageUsernamePassword; } /*! See WlanWizardPage. - + Validates the content of the page. - + @return true if content is valid. */ bool EapWizardPageInnerType::showPage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEINNERTYPE_SHOWPAGE_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGEINNERTYPE_SHOWPAGE_EXIT ); return mValid; } /*! Handler for itemsSelected() signal from HbRadioButtonList. - + @param [in] index NOT USED */ void EapWizardPageInnerType::itemSelected(int index ) { + OstTraceFunctionEntry0( EAPWIZARDPAGEINNERTYPE_ITEMSELECTED_ENTRY ); Q_UNUSED(index); mValid = true; mWizard->wizardHelper()->enableNextButton(mValid); + OstTraceFunctionExit0( EAPWIZARDPAGEINNERTYPE_ITEMSELECTED_EXIT ); } /*! Appends given method to radiobutton list if plugin (method) is supported - + @param [in,out] items the content of radiobutton list @param [in] pluginHandle EAP Type plugin handle to be added. */ @@ -194,9 +212,11 @@ QStringList &items, EapQtPluginHandle::Plugin innerType) { + OstTraceFunctionEntry0( EAPWIZARDPAGEINNERTYPE_APPENDTOLIST_ENTRY ); if (mWizard->eapConfigurationInterface()->isSupportedInnerType( static_cast(mOuterType), innerType)) { items << mWizard->eapTypeToString(innerType); mEapTypes.append(innerType); } + OstTraceFunctionExit0( EAPWIZARDPAGEINNERTYPE_APPENDTOLIST_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpagenewpacstore.cpp --- a/wlanutilities/eapwizard/src/eapwizardpagenewpacstore.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpagenewpacstore.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -31,6 +31,11 @@ #include "wlanwizardhelper.h" #include "eapwizardpagenewpacstore.h" #include "eapwizard_p.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpagenewpacstoreTraces.h" +#endif + /*! \class EapWizardPageNewPacStore @@ -62,6 +67,8 @@ mTitlePasswordNew(NULL), mTitlePasswordConfirm(NULL) { + OstTraceFunctionEntry0( EAPWIZARDPAGENEWPACSTORE_EAPWIZARDPAGENEWPACSTORE_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGENEWPACSTORE_EAPWIZARDPAGENEWPACSTORE_EXIT ); } /*! @@ -69,6 +76,8 @@ */ EapWizardPageNewPacStore::~EapWizardPageNewPacStore() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGENEWPACSTORE_EAPWIZARDPAGENEWPACSTORE_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGENEWPACSTORE_EAPWIZARDPAGENEWPACSTORE_EXIT ); } /*! @@ -76,6 +85,7 @@ */ HbWidget* EapWizardPageNewPacStore::initializePage() { + OstTraceFunctionEntry0( EAPWIZARDPAGENEWPACSTORE_INITIALIZEPAGE_ENTRY ); if (!mWidget) { bool ok; mDocumentLoader.reset( @@ -129,6 +139,7 @@ this, SLOT(textChanged(const QString &))); Q_ASSERT(ok); } + OstTraceFunctionExit0( EAPWIZARDPAGENEWPACSTORE_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -139,12 +150,14 @@ */ void EapWizardPageNewPacStore::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( EAPWIZARDPAGENEWPACSTORE_LOADDOCMLSECTION_ENTRY ); EapWizardPage::loadDocmlSection( mDocumentLoader.data(), orientation, ":/docml/occ_eap_wizard_05_07.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( EAPWIZARDPAGENEWPACSTORE_LOADDOCMLSECTION_EXIT ); } /*! @@ -156,11 +169,13 @@ */ bool EapWizardPageNewPacStore::showPage() { + OstTraceFunctionEntry0( EAPWIZARDPAGENEWPACSTORE_SHOWPAGE_ENTRY ); bool valid = false; if (mValidator->validate(mEditPasswordNew->text()) == EapQtValidator::StatusOk && mEditPasswordNew->text() == mEditPasswordConfirm->text()) { valid = true; } + OstTraceFunctionExit0( EAPWIZARDPAGENEWPACSTORE_SHOWPAGE_EXIT ); return valid; } @@ -171,7 +186,9 @@ */ int EapWizardPageNewPacStore::nextId() const { + OstTraceFunctionEntry0( EAPWIZARDPAGENEWPACSTORE_NEXTID_ENTRY ); mWizard->setConfigurations(EapWizardPrivate::PacStorePassword, mEditPasswordNew->text()); + OstTraceFunctionExit0( EAPWIZARDPAGENEWPACSTORE_NEXTID_EXIT ); return EapWizardPage::PageUsernamePassword; } @@ -182,6 +199,8 @@ */ void EapWizardPageNewPacStore::textChanged(const QString &text) { + OstTraceFunctionEntry0( EAPWIZARDPAGENEWPACSTORE_TEXTCHANGED_ENTRY ); Q_UNUSED(text); mWizard->wizardHelper()->enableNextButton(showPage()); + OstTraceFunctionExit0( EAPWIZARDPAGENEWPACSTORE_TEXTCHANGED_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpageoutertype.cpp --- a/wlanutilities/eapwizard/src/eapwizardpageoutertype.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpageoutertype.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -32,6 +32,11 @@ #include "wlanwizardhelper.h" #include "eapwizard_p.h" #include "eapwizardpageoutertype.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpageoutertypeTraces.h" +#endif + /*! \class EapWizardPageOuterType @@ -60,6 +65,8 @@ mDocumentLoader(NULL), mValid(false) { + OstTraceFunctionEntry0( EAPWIZARDPAGEOUTERTYPE_EAPWIZARDPAGEOUTERTYPE_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGEOUTERTYPE_EAPWIZARDPAGEOUTERTYPE_EXIT ); } /*! @@ -67,6 +74,8 @@ */ EapWizardPageOuterType::~EapWizardPageOuterType() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGEOUTERTYPE_EAPWIZARDPAGEOUTERTYPE_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGEOUTERTYPE_EAPWIZARDPAGEOUTERTYPE_EXIT ); } /*! @@ -74,6 +83,7 @@ */ HbWidget* EapWizardPageOuterType::initializePage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEOUTERTYPE_INITIALIZEPAGE_ENTRY ); if (!mWidget) { bool ok; mDocumentLoader.reset( @@ -116,6 +126,7 @@ SLOT(loadDocmlSection(Qt::Orientation))); Q_ASSERT(ok); } + OstTraceFunctionExit0( EAPWIZARDPAGEOUTERTYPE_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -126,12 +137,14 @@ */ void EapWizardPageOuterType::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( EAPWIZARDPAGEOUTERTYPE_LOADDOCMLSECTION_ENTRY ); EapWizardPage::loadDocmlSection( mDocumentLoader.data(), orientation, ":/docml/occ_eap_wizard_01_02_04.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( EAPWIZARDPAGEOUTERTYPE_LOADDOCMLSECTION_EXIT ); } /*! @@ -146,6 +159,7 @@ */ int EapWizardPageOuterType::nextId() const { + OstTraceFunctionEntry0( EAPWIZARDPAGEOUTERTYPE_NEXTID_ENTRY ); int id = WlanWizardPage::PageNone; EapQtPluginHandle::Plugin handle = static_cast(mEapTypes.at(mRadio->selected())); @@ -173,6 +187,7 @@ mWizard->setConfigurations(EapWizardPrivate::OuterType, handle); + OstTraceFunctionExit0( EAPWIZARDPAGEOUTERTYPE_NEXTID_EXIT ); return id; } @@ -185,6 +200,8 @@ */ bool EapWizardPageOuterType::showPage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEOUTERTYPE_SHOWPAGE_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGEOUTERTYPE_SHOWPAGE_EXIT ); return mValid; } @@ -195,9 +212,11 @@ */ void EapWizardPageOuterType::itemSelected(int index) { + OstTraceFunctionEntry0( EAPWIZARDPAGEOUTERTYPE_ITEMSELECTED_ENTRY ); Q_UNUSED(index); mValid = true; mWizard->wizardHelper()->enableNextButton(mValid); + OstTraceFunctionExit0( EAPWIZARDPAGEOUTERTYPE_ITEMSELECTED_EXIT ); } /*! @@ -209,11 +228,13 @@ void EapWizardPageOuterType::appendToList( QStringList &items, int pluginHandle) { + OstTraceFunctionEntry0( EAPWIZARDPAGEOUTERTYPE_APPENDTOLIST_ENTRY ); if (mWizard->eapConfigurationInterface()->isSupportedOuterType( (EapQtPluginHandle::Plugin)pluginHandle)) { items << mWizard->eapTypeToString(pluginHandle); mEapTypes.append(pluginHandle); } + OstTraceFunctionExit0( EAPWIZARDPAGEOUTERTYPE_APPENDTOLIST_EXIT ); } /* @@ -223,6 +244,7 @@ */ int EapWizardPageOuterType::nextIdForEapFast() const { + OstTraceFunctionEntry0( EAPWIZARDPAGEOUTERTYPE_NEXTIDFOREAPFAST_ENTRY ); int pageId; mWizard->setConfigurations(EapWizardPrivate::InnerType, @@ -256,5 +278,6 @@ break; } + OstTraceFunctionExit0( EAPWIZARDPAGEOUTERTYPE_NEXTIDFOREAPFAST_EXIT ); return pageId; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpagepacstorepasswordconfirm.cpp --- a/wlanutilities/eapwizard/src/eapwizardpagepacstorepasswordconfirm.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpagepacstorepasswordconfirm.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -31,6 +31,11 @@ #include "wlanwizardhelper.h" #include "eapwizardpagepacstorepasswordconfirm.h" #include "eapwizard_p.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpagepacstorepasswordconfirmTraces.h" +#endif + /*! \class EapWizardPagePacStorePasswordConfirm @@ -60,6 +65,8 @@ mEditPasswordConfirm(NULL), mLabelError(NULL) { + OstTraceFunctionEntry0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_EXIT ); } /*! @@ -67,6 +74,8 @@ */ EapWizardPagePacStorePasswordConfirm::~EapWizardPagePacStorePasswordConfirm() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_EXIT ); } /*! @@ -74,6 +83,7 @@ */ HbWidget* EapWizardPagePacStorePasswordConfirm::initializePage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_INITIALIZEPAGE_ENTRY ); if (!mWidget) { bool ok; mDocumentLoader.reset( @@ -112,6 +122,7 @@ Q_ASSERT(ok); } + OstTraceFunctionExit0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -123,12 +134,14 @@ */ void EapWizardPagePacStorePasswordConfirm::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_LOADDOCMLSECTION_ENTRY ); EapWizardPage::loadDocmlSection( mDocumentLoader.data(), orientation, ":/docml/occ_eap_wizard_08.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_LOADDOCMLSECTION_EXIT ); } /*! @@ -140,6 +153,7 @@ */ int EapWizardPagePacStorePasswordConfirm::nextId() const { + OstTraceFunctionEntry0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_NEXTID_ENTRY ); int id; if (mValidator->validate(mEditPasswordConfirm->text()) == EapQtValidator::StatusOk) { @@ -154,6 +168,7 @@ mLabelError->setPlainText(hbTrId("txt_occ_info_incorrect_password")); } + OstTraceFunctionExit0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_NEXTID_EXIT ); return id; } @@ -166,7 +181,9 @@ */ bool EapWizardPagePacStorePasswordConfirm::showPage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_SHOWPAGE_ENTRY ); mEditPasswordConfirm->setFocus(); + OstTraceFunctionExit0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_SHOWPAGE_EXIT ); return true; } @@ -180,8 +197,10 @@ bool EapWizardPagePacStorePasswordConfirm::eventFilter( QObject *obj, QEvent *event) { + OstTraceFunctionEntry0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_EVENTFILTER_ENTRY ); if (obj == mEditPasswordConfirm && event->type() == QEvent::FocusIn) { mLabelError->setPlainText(""); } + OstTraceFunctionExit0( EAPWIZARDPAGEPACSTOREPASSWORDCONFIRM_EVENTFILTER_EXIT ); return false; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/eapwizard/src/eapwizardpageusernamepassword.cpp --- a/wlanutilities/eapwizard/src/eapwizardpageusernamepassword.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpageusernamepassword.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -33,6 +33,11 @@ #include "wlanwizardhelper.h" #include "eapwizardpageusernamepassword.h" #include "eapwizard_p.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "eapwizardpageusernamepasswordTraces.h" +#endif + /*! \class EapWizardPageUsernamePassword @@ -50,7 +55,7 @@ /*! Constructor. - + @param [in] parent Pointer to EAP Wizard private implementation. */ EapWizardPageUsernamePassword::EapWizardPageUsernamePassword( @@ -65,6 +70,8 @@ mTitleUsername(NULL), mTitlePassword(NULL) { + OstTraceFunctionEntry0( EAPWIZARDPAGEUSERNAMEPASSWORD_EAPWIZARDPAGEUSERNAMEPASSWORD_ENTRY ); + OstTraceFunctionExit0( EAPWIZARDPAGEUSERNAMEPASSWORD_EAPWIZARDPAGEUSERNAMEPASSWORD_EXIT ); } /*! @@ -72,6 +79,8 @@ */ EapWizardPageUsernamePassword::~EapWizardPageUsernamePassword() { + OstTraceFunctionEntry0( DUP1_EAPWIZARDPAGEUSERNAMEPASSWORD_EAPWIZARDPAGEUSERNAMEPASSWORD_ENTRY ); + OstTraceFunctionExit0( DUP1_EAPWIZARDPAGEUSERNAMEPASSWORD_EAPWIZARDPAGEUSERNAMEPASSWORD_EXIT ); } /*! @@ -79,6 +88,7 @@ */ HbWidget* EapWizardPageUsernamePassword::initializePage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEUSERNAMEPASSWORD_INITIALIZEPAGE_ENTRY ); if (!mWidget) { bool ok = true; mDocumentLoader.reset( @@ -101,21 +111,21 @@ mEditPassword = qobject_cast (mDocumentLoader->findWidget("lineEditPassword")); Q_ASSERT(mEditPassword); - + mTitlePassword->setPlainText(hbTrId("txt_occ_setlabel_eap_password")); - + ok = connect( mWizard->wizardHelper()->mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(loadDocmlSection(Qt::Orientation))); Q_ASSERT(ok); - + ok = connect( mEditUsername, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); Q_ASSERT(ok); - + ok = connect( mEditPassword, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); @@ -127,7 +137,7 @@ if (eapType != EapQtPluginHandle::PluginLeap) { eapType = mWizard->configurations(EapWizardPrivate::InnerType).toInt(); } - + EapQtPluginHandle plugin(static_cast(eapType)); mValidatorUsername.reset( @@ -143,68 +153,76 @@ EapQtConfig::Password)); Q_ASSERT(mValidatorPassword.data()); mValidatorPassword->updateEditor(mEditPassword); - + mTitleUsername->setPlainText( - HbParameterLengthLimiter( - hbTrId("txt_occ_setlabel_user_name_for_1")).arg( - mWizard->eapTypeToString(eapType))); + HbParameterLengthLimiter("txt_occ_setlabel_user_name_for_1").arg( + mWizard->eapTypeToString(eapType))); + OstTraceFunctionExit0( EAPWIZARDPAGEUSERNAMEPASSWORD_INITIALIZEPAGE_EXIT ); return mWidget; } /*! Loads the required orientation of docml. - + @param [in] orientation Orientation to be loaded. */ void EapWizardPageUsernamePassword::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( EAPWIZARDPAGEUSERNAMEPASSWORD_LOADDOCMLSECTION_ENTRY ); EapWizardPage::loadDocmlSection( mDocumentLoader.data(), orientation, ":/docml/occ_eap_wizard_05_07.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( EAPWIZARDPAGEUSERNAMEPASSWORD_LOADDOCMLSECTION_EXIT ); } /*! See WlanWizardPage. - + Validates the content of the page. - + @return true if content is valid. */ bool EapWizardPageUsernamePassword::showPage() { + OstTraceFunctionEntry0( EAPWIZARDPAGEUSERNAMEPASSWORD_SHOWPAGE_ENTRY ); bool valid = false; if (mValidatorUsername->validate(mEditUsername->text()) == EapQtValidator::StatusOk && mValidatorPassword->validate(mEditPassword->text()) == - EapQtValidator::StatusOk) { + EapQtValidator::StatusOk) { valid = true; } + OstTraceFunctionExit0( EAPWIZARDPAGEUSERNAMEPASSWORD_SHOWPAGE_EXIT ); return valid; } /*! See WlanWizardPage. - + @return next wizard page: EapWizardPage::PageProcessSettings */ int EapWizardPageUsernamePassword::nextId() const { + OstTraceFunctionEntry0( EAPWIZARDPAGEUSERNAMEPASSWORD_NEXTID_ENTRY ); mWizard->setConfigurations(EapWizardPrivate::Username, mEditUsername->text()); mWizard->setConfigurations(EapWizardPrivate::Password, mEditPassword->text()); + OstTraceFunctionExit0( EAPWIZARDPAGEUSERNAMEPASSWORD_NEXTID_EXIT ); return EapWizardPage::PageProcessSettings; } /*! Slot for textChanged() signal from HbLineEdit. - + @param [in] text NOT USED. */ void EapWizardPageUsernamePassword::textChanged(const QString & text ) { + OstTraceFunctionEntry0( EAPWIZARDPAGEUSERNAMEPASSWORD_TEXTCHANGED_ENTRY ); Q_UNUSED(text); mWizard->wizardHelper()->enableNextButton(showPage()); + OstTraceFunctionExit0( EAPWIZARDPAGEUSERNAMEPASSWORD_TEXTCHANGED_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanindicatorplugin/inc/wlanindicatorplugin.h --- a/wlanutilities/wlanindicatorplugin/inc/wlanindicatorplugin.h Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanindicatorplugin/inc/wlanindicatorplugin.h Wed Aug 18 10:52:46 2010 +0300 @@ -22,6 +22,10 @@ #include #include #include +#include + +// Forward declarations +class HbTranslator; const int wlanNotConnected = 0; const int wlanConnected = 1; @@ -51,7 +55,7 @@ bool handleClientRequest (RequestType type, const QVariant ¶meter); bool handleInteraction (InteractionType type); QVariant indicatorData(int role) const; - + private: Q_DISABLE_COPY(WlanIndicatorPlugin) @@ -59,5 +63,6 @@ int mError; // Indicator error QVariant mParameter; // Used to contain the status of wlan QProcess process; // Process to start external programs + QSharedPointer mTranslator; // Translator for the localisation Text Id's }; #endif //WLANINDICATORPLUGIN_H diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp --- a/wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -96,8 +96,8 @@ Q_UNUSED(indicatorType) // Install localization - HbTranslator *translator(new HbTranslator("wlanindicatorplugin")); - + mTranslator = QSharedPointer(new HbTranslator("wlanindicatorplugin")); + OstTraceFunctionExit1(WLANINDICATORPLUGIN_CREATEINDICATOR_EXIT, this); return this; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanindicatorplugin/wlanindicatorplugin.pro --- a/wlanutilities/wlanindicatorplugin/wlanindicatorplugin.pro Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanindicatorplugin/wlanindicatorplugin.pro Wed Aug 18 10:52:46 2010 +0300 @@ -20,12 +20,12 @@ # directories DEPENDPATH += . -INCLUDEPATH += .\inc +INCLUDEPATH += ./inc -HEADERS += inc\wlanindicatorplugin.h \ - traces\OstTraceDefinitions.h +HEADERS += inc/wlanindicatorplugin.h \ + traces/OstTraceDefinitions.h -SOURCES += src\wlanindicatorplugin.cpp +SOURCES += src/wlanindicatorplugin.cpp TRANSLATIONS = wlanindicatorplugin.ts diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanlogin/wlanloginapp/src/wlanloginengine.cpp --- a/wlanutilities/wlanlogin/wlanloginapp/src/wlanloginengine.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanlogin/wlanloginapp/src/wlanloginengine.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -46,6 +46,7 @@ // External function prototypes // Local constants +const QString iapIdentifierPrefix = "I_"; // ======== LOCAL FUNCTIONS ======== @@ -86,8 +87,10 @@ WlanLoginEngine::~WlanLoginEngine() { OstTraceFunctionEntry0(WLANLOGINENGINE_DESTRUCTOR_ENTRY); - - mNetworkSession->close(); + + if (mNetworkSession) { + mNetworkSession->close(); + } OstTraceFunctionExit0(WLANLOGINENGINE_DESTRUCTOR_EXIT); } @@ -228,7 +231,8 @@ setEngineState(WlanLoginEngine::OpeningNetworkSession); //Get configuration that matches the provided IAP - QNetworkConfiguration netConfiguration = mNetConfigurationManager->configurationFromIdentifier(QString::number(mIap)); + //Note that identifier must be given in format I_ + IAP ID + QNetworkConfiguration netConfiguration = mNetConfigurationManager->configurationFromIdentifier(iapIdentifierPrefix + QString::number(mIap)); OstTrace1( TRACE_NORMAL, diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanqtutilities/tsrc/stubs/ictswlanlogininterface.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wlanutilities/wlanqtutilities/tsrc/stubs/ictswlanlogininterface.h Wed Aug 18 10:52:46 2010 +0300 @@ -0,0 +1,68 @@ +/* +* Copyright (c) 2010 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* ICTS Wlan Login Interface stubbing for WLAN Qt Utilities. +*/ + +#ifndef ICTSWLANLOGININTERFACE_H +#define ICTSWLANLOGININTERFACE_H + +// System includes +#include + +// User includes + +// Forward declarations + +// External data types + +// Constants + +// Class declaration +class IctsWlanLoginInterface: public QObject +{ + Q_OBJECT + +public: + + // Data types + + /*! + Internet connectivity test result type + */ + enum ictsResultType { + IctsPassed = 0, //!< Internet connectivity test passed + IctsHotspotPassed, //!< Internet connectivity test passed against hotspot access point + IctsCanceled, //!< Internet connectivity test was cancelled due to user action + IctsFailed //!< internet connectivity test failed + }; + + IctsWlanLoginInterface(QObject *parent); + + ~IctsWlanLoginInterface(); + +public: + + void start(int iapId, int netId); + + void stop(); + +signals: + + void ictsResult(int ictsResult); + + void hotspotCase(); +}; + +#endif // ICTSWLANLOGININTERFACE_H diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanqtutilities/tsrc/stubs/stub_ictswlanlogininterface.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wlanutilities/wlanqtutilities/tsrc/stubs/stub_ictswlanlogininterface.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -0,0 +1,56 @@ +/* +* Copyright (c) 2010 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* ICTS Wlan Login Interface stubbing for WLAN Qt Utilities. +*/ + +#include "ictswlanlogininterface.h" + +#include "wlanqtutilstestcontext.h" + +extern WlanQtUtilsTestContext testContext; + +/*! + Constructor. +*/ +IctsWlanLoginInterface::IctsWlanLoginInterface(QObject *parent) +{ + Q_UNUSED(parent); +} + +/*! + Destructor. +*/ +IctsWlanLoginInterface::~IctsWlanLoginInterface() +{ +} + +/*! + Function for launching Wlan login application. + + @param [in] iapId Internet accesspoint id to be tested + @param [in] netId network identifier of the connection to be used +*/ +void IctsWlanLoginInterface::start(int iapId, int netId) +{ + Q_UNUSED(iapId); + Q_UNUSED(netId); +} + +/*! + Function for stopping launched Wlan login application. +*/ +void IctsWlanLoginInterface::stop() +{ +} diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.cpp --- a/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -1183,14 +1183,11 @@ // Connection test automatically started at this point. Call result function explicitly // No interface exists that we could check that the IAP is moved to Internet SNAP correctly -#if 0 // TODO: Make this work with the new WLAN login interface - TBuf<5> string; - wlanQtUtils_->d_ptr->mConnTestWrapper->d_ptr_->ConnectivityObserver(EConnectionOk, string); + wlanQtUtils_->d_ptr->updateIctResult(IctsWlanLoginInterface::IctsPassed); - subTestSignalWaitAndTake(signalIctResult_, &arguments); + subTestSignalWaitAndTake(signalIctResult_, &arguments); QCOMPARE(arguments.at(0).toInt(), iapId); - QCOMPARE(arguments.at(1).toBool(), true); -#endif + QCOMPARE(arguments.at(1).toInt(), (int)WlanQtUtils::IctPassed); } /** @@ -1200,7 +1197,7 @@ { // Create and connect an IAP and request ICT to be run QScopedPointer wlanAp(subTestNewAp()); - wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestErr"); + wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestErr1"); wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa); int iapId = wlanQtUtils_->createIap(wlanAp.data()); @@ -1225,14 +1222,109 @@ // Connection test automatically started at this point. Call result function explicitly // No interface exists that we could check that IAP is not moved to another SNAP -#if 0 // TODO: Make this work with the new WLAN login interface - TBuf<5> string; - wlanQtUtils_->d_ptr->mConnTestWrapper->d_ptr_->ConnectivityObserver(EHttpAuthenticationNeeded, string); + wlanQtUtils_->d_ptr->updateIctResult(IctsWlanLoginInterface::IctsFailed); + + subTestSignalWaitAndTake(signalIctResult_, &arguments); + QCOMPARE(arguments.at(0).toInt(), iapId); + QCOMPARE(arguments.at(1).toInt(), (int)WlanQtUtils::IctFailed); + + // Repeat with cancel status + // Send event for connection status change -> closed. + wlanQtUtils_->d_ptr->mConMonWrapper->d_ptrInfo->EventL(CConnMonConnectionStatusChange( + testContext.connMon_.activeConnections_.activeConnList_[0]->connectionId(), + 0, + KLinkLayerClosed)); + + // Send event for connection deletion. + wlanQtUtils_->d_ptr->mConMonWrapper->d_ptrInfo->EventL(CConnMonEventBase( + EConnMonDeleteConnection, + testContext.connMon_.activeConnections_.activeConnList_[0]->connectionId())); + + subTestSignalWaitAndTake(signalWlanNetworkClosed_, &arguments); + QCOMPARE(arguments.at(0).toInt(), iapId); + QCOMPARE(arguments.at(1).toInt(), KErrNone); + + wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestErr2"); + + iapId = wlanQtUtils_->createIap(wlanAp.data()); + wlanQtUtils_->connectIap(iapId, true); + + testContext.connMon_.activeConnections_.createDefaultActiveConnList(1, iapId); + wlanQtUtils_->d_ptr->mConMonWrapper->d_ptrInfo->EventL(CConnMonEventBase( + EConnMonCreateConnection, + testContext.connMon_.activeConnections_.activeConnList_[0]->connectionId())); + wlanQtUtils_->d_ptr->mConMonWrapper->d_ptrInfo->EventL(CConnMonConnectionStatusChange( + testContext.connMon_.activeConnections_.activeConnList_[0]->connectionId(), + 0, + KConnectionOpen)); + subTestSignalWaitAndTake(signalWlanNetworkOpened_, &arguments); + QCOMPARE(arguments.at(0).toInt(), iapId); + + wlanQtUtils_->d_ptr->mConMonWrapper->d_ptrInfo->EventL(CConnMonConnectionStatusChange( + testContext.connMon_.activeConnections_.activeConnList_[0]->connectionId(), + 0, + KLinkLayerOpen)); + + // Connection test automatically started at this point. Call result function explicitly + // No interface exists that we could check that IAP is not moved to another SNAP + wlanQtUtils_->d_ptr->updateIctResult(IctsWlanLoginInterface::IctsCanceled); + + subTestSignalWaitAndTake(signalIctResult_, &arguments); + QCOMPARE(arguments.at(0).toInt(), iapId); + QCOMPARE(arguments.at(1).toInt(), (int)WlanQtUtils::IctCancelled); +} - subTestSignalWaitAndTake(signalIctResult_, &arguments); +/** + * This function tests ICT when connection test passes in hotspot case. + */ +void TestWlanQtUtils::testConnectionTestHotspot() +{ + // Create new IAP to test + QScopedPointer wlanAp(subTestNewAp()); + wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestHotspot"); + int iapId = wlanQtUtils_->createIap(wlanAp.data()); + QVERIFY(iapId != WlanQtUtils::IapIdNone); + + testContext.esock_.startRetValue_ = KErrNone; + + // Esock stub completes connection creation immediately + wlanQtUtils_->connectIap(iapId, true); + + // Connection creation in ConnMon interface + testContext.connMon_.activeConnections_.createDefaultActiveConnList(1, iapId); + wlanQtUtils_->d_ptr->mConMonWrapper->d_ptrInfo->EventL(CConnMonEventBase( + EConnMonCreateConnection, + testContext.connMon_.activeConnections_.activeConnList_[0]->connectionId())); + + // Connection status change in ConnMon interface + wlanQtUtils_->d_ptr->mConMonWrapper->d_ptrInfo->EventL(CConnMonConnectionStatusChange( + testContext.connMon_.activeConnections_.activeConnList_[0]->connectionId(), + 0, + KConnectionOpen)); + + // Receive signal for connection opening (caused by connectIap, which completed immediately) + QList arguments; + subTestSignalWaitAndTake(signalWlanNetworkOpened_, &arguments); QCOMPARE(arguments.at(0).toInt(), iapId); - QCOMPARE(arguments.at(1).toBool(), false); -#endif + + // Connection status change to opened in ConnMon interface. Sub test cases between test + // cases check that no extra signals are sent + wlanQtUtils_->d_ptr->mConMonWrapper->d_ptrInfo->EventL(CConnMonConnectionStatusChange( + testContext.connMon_.activeConnections_.activeConnList_[0]->connectionId(), + 0, + KLinkLayerOpen)); + + // Connection test automatically started at this point. + // Call hotspot case slot explicitly + wlanQtUtils_->d_ptr->updateIctHotspotCase(); + + // Call result function explicitly + // No interface exists that we could check that the IAP is not moved to another SNAP + wlanQtUtils_->d_ptr->updateIctResult(IctsWlanLoginInterface::IctsHotspotPassed); + + subTestSignalWaitAndTake(signalIctResult_, &arguments); + QCOMPARE(arguments.at(0).toInt(), iapId); + QCOMPARE(arguments.at(1).toInt(), (int)WlanQtUtils::IctHotspotPassed); } /** diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.h --- a/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.h Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.h Wed Aug 18 10:52:46 2010 +0300 @@ -99,6 +99,7 @@ // Test functions for private implementation (tested via public interface) void testConnectionTestOk(); void testConnectionTestErr(); + void testConnectionTestHotspot(); void testConnMonEventGprs(); void testConnMonEventCreatedBeforeConstructor(); diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.pro --- a/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.pro Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.pro Wed Aug 18 10:52:46 2010 +0300 @@ -38,8 +38,8 @@ INCLUDEPATH += \ . \ + stubs \ ../../inc \ - stubs \ ../base/inc \ ../wrapper/inc \ ../traces @@ -78,6 +78,7 @@ ../wrapper/inc/wlanqtutilsconmonwrapperinfo_symbian.h \ ../wrapper/inc/wlanqtutilsesockwrapper_symbian.h \ ../wrapper/inc/wlanqtutilsscan_symbian.h \ + stubs/ictswlanlogininterface.h \ stubs/wlanmgmtclient.h \ stubs/wlanscaninfo.h @@ -88,8 +89,9 @@ ../wrapper/src/wlanqtutilsscan_symbian.cpp \ stubs/stub_connmon.cpp \ stubs/stub_esock.cpp \ + stubs/stub_ictswlanlogininterface.cpp \ stubs/stub_wlanmgmtclient.cpp \ stubs/stub_wlanscaninfo.cpp } -LIBS += -lconnmon -lconnection_settings_shim -lextendedconnpref -lnetmeta -lesock -lictswlanlogininterface +LIBS += -lconnmon -lconnection_settings_shim -lextendedconnpref -lnetmeta -lesock -lcharconv diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanqtutilities/tsrc/tools/default.cre Binary file wlanutilities/wlanqtutilities/tsrc/tools/default.cre has changed diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanqtutilities/tsrc/tools/variantdata_wlanqtutils.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wlanutilities/wlanqtutilities/tsrc/tools/variantdata_wlanqtutils.xml Wed Aug 18 10:52:46 2010 +0300 @@ -0,0 +1,764 @@ + + + + + + whenneeded + 11 + 0 + 1 + 2 + 3 + 4 + 6 + 7 + 256 + 256 + 9 + 0 + 8 + 1 + 2 + 4 + 5 + 6 + 7 + Destination + Internet + Known + Confirm + Wlan only + -1 + 1 + -1 + -1 + 1 + -1 + -1 + 1 + 4 + 7 + 2347 + 100 + 1 + 0 + + + + packet data 1 + 1 + No + No + No + No + ConfirmFirst + IPv4 + packetdata1 + + No + + Normal + + http://www.nokia.com + On + Continuous + + + + + + + 0 + + Yes + 0 + + + + packet data 2 + 3 + No + No + No + No + ConfirmFirst + IPv4 + packetdata2 + + No + + Normal + + http://www.nokia.com + On + Continuous + + + + + + + 0 + + Yes + 0 + + + + packet data 3 + 4 + No + No + No + No + ConfirmFirst + IPv4 + packetdata3 + + No + + Normal + + http://www.nokia.com + On + Continuous + + + + + + + 0 + + Yes + 0 + + + + Streaming + 9 + No + No + No + No + ConfirmFirst + IPv4 + streaming + + No + + Normal + + http://www.nokia.com + On + Continuous + + + + + + + 0 + + Yes + 0 + + + + + + WLAN IAP 1 + 5 + No + No + No + No + ShowProgress + WLAN IAP 1 + + Infrastructure + Open + + + + + + + + + + No + + + key1 + Shared + 64 + ASCII + + 64 + ASCII + + 64 + ASCII + + 64 + ASCII + + + No + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WLAN IAP 2 + 6 + No + No + No + No + ConfirmFirst + WLAN IAP 2 + http://themaximus.security.max + Ad-hoc + WEP + + + + + + + 192.168.100.200 + 8000 + + No + + + key1 + Open + 64 + ASCII + w2key + 64 + Hexadecimal + + 64 + ASCII + + 64 + ASCII + + + No + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WLAN IAP 3 + 7 + No + No + No + No + ConfirmFirst + WLAN IAP 3 + + Infrastructure + WPA + + + + + + + + + + No + + + key1 + Shared + 64 + ASCII + + 64 + ASCII + + 64 + ASCII + + 64 + ASCII + + wlan3key + Yes + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Home WLAN + 8 + No + No + No + No + ShowProgress + Home WLAN + + Infrastructure + Open + + + + + + + + + + No + + + key1 + Shared + 64 + ASCII + + 64 + ASCII + + 64 + ASCII + + 64 + ASCII + + + No + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Internet + 3 + Internet + 2 + No + No + Yes + 0 + + packet data 1 + packet data 2 + packet data 3 + WLAN IAP 1 + WLAN IAP 2 + WLAN IAP 3 + + + + + + + Multimedia msg. + 4 + MMS + 2 + No + Yes + No + 2 + + + + + + + + + + + + + + WAP services + 5 + Operator + 2 + No + No + No + 4 + + + + + + + + + + + + + + >My SNAP + 6 + + 2 + No + No + No + 3 + + Home WLAN + Streaming + + + + + + + + + + + \ No newline at end of file diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp --- a/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -29,6 +29,7 @@ #include #include #include +#include #include @@ -274,15 +275,17 @@ case WlanQtUtils::ConnStatusConnecting: // WLAN is connecting Q_ASSERT(iapId != WlanQtUtils::IapIdNone); - status = hbTrId("txt_occ_grid_connecting_to_1").arg( - mEngine->wlanQtUtils()->iapName(iapId)); + status = HbParameterLengthLimiter( + "txt_occ_grid_connecting_to_1").arg( + mEngine->wlanQtUtils()->iapName(iapId)); break; case WlanQtUtils::ConnStatusConnected: // WLAN is connected Q_ASSERT(iapId != WlanQtUtils::IapIdNone); - status = hbTrId("txt_occ_grid_connected_to_1").arg( - mEngine->wlanQtUtils()->iapName(iapId)); + status = HbParameterLengthLimiter( + "txt_occ_grid_connected_to_1").arg( + mEngine->wlanQtUtils()->iapName(iapId)); break; default: @@ -337,8 +340,9 @@ // Item was an IAP, connect it. mConnectingIapId = iapId; mStatusLabel->setPlainText( - hbTrId("txt_occ_grid_connecting_to_1").arg( - mEngine->wlanQtUtils()->iapName(iapId))); + HbParameterLengthLimiter( + "txt_occ_grid_connecting_to_1").arg( + mEngine->wlanQtUtils()->iapName(iapId))); mEngine->wlanQtUtils()->connectIap(iapId); } else { // Item is a WLAN AP. Summon the Wlan Wizard to handle creation @@ -439,8 +443,9 @@ mConnectingIapId = WlanQtUtils::IapIdNone; mStatusLabel->setPlainText( - hbTrId("txt_occ_grid_connected_to_1").arg( - mEngine->wlanQtUtils()->iapName(iapId))); + HbParameterLengthLimiter( + "txt_occ_grid_connected_to_1").arg( + mEngine->wlanQtUtils()->iapName(iapId))); // Update the list widget content updateListContent(); diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/inc/wlanwizardpagenetworkmode.h --- a/wlanutilities/wlanwizard/inc/wlanwizardpagenetworkmode.h Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/inc/wlanwizardpagenetworkmode.h Wed Aug 18 10:52:46 2010 +0300 @@ -65,13 +65,24 @@ private: Q_DISABLE_COPY(WlanWizardPageNetworkMode) - void addToList(QStringList &list, const QString &item, int mode, bool isHidden); + void addToList( + QStringList &list, + const QString &item, + int mode, + bool isHidden, + bool wpsSupported); void populateRadioButtonList(QStringList &list); int selectNextPage(const WlanNetworkSetting &setting) const; private slots: private: + + /*! + * Internal network mode value constant. Used when wps used. + */ + static const int NetworkModeNone = -1; + /*! * Pointer to the view. */ @@ -108,6 +119,12 @@ * the initialization of the page. */ QList mIsHidden; + + /*! + * List of wps support. This list is tied to the radio buttons during + * the initialization of the page. + */ + QList mWpsSupported; }; /*! @} */ diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/inc/wlanwizardscanlist.h --- a/wlanutilities/wlanwizard/inc/wlanwizardscanlist.h Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/inc/wlanwizardscanlist.h Wed Aug 18 10:52:46 2010 +0300 @@ -54,8 +54,16 @@ class WlanSecuritySetting { public: + //! Enumerated value defined by CMManagerShim::WlanSecMode int mode; + + //! true, if passkey is required, false otherwise bool usePsk; + + /*! + * Identifier of the next page associated with this security mode. + * Page ids are defined in WlanWizardPageInternal::WlanPageIds + */ int nextPageId; bool operator==(const WlanSecuritySetting& setting) const { @@ -72,8 +80,13 @@ class WlanNetworkSetting { public: + //! Enumerated value defined by CMManagerShim::WlanConnMode int mode; + + //! true, if hidden, false otherwise bool hidden; + + //! true, if supported, false otherwise bool wpsSupported; bool operator==(const WlanNetworkSetting& setting) const { @@ -110,6 +123,7 @@ int netModes() const; int secModes(WlanNetworkSetting netMode) const; QList getNetModes() const; + bool wpsSelected() const; private: // Disabling implicit assignment operator @@ -117,6 +131,7 @@ private: QHash > mOpenOptions; + bool mWpsSelected; }; /*! diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizard_p.cpp --- a/wlanutilities/wlanwizard/src/wlanwizard_p.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizard_p.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -100,6 +100,7 @@ mPageFinished(false), mClosed(false) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_ENTRY ); OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_WLANWIZARDPRIVATE, "WlanWizardPrivate::WlanWizardPrivate;this=%x", this ); @@ -136,6 +137,7 @@ "WlanWizardPrivate::WlanWizardPrivate - done;" "this=%x;mFirstPageId=%{PageIds}", ( unsigned )this, mFirstPageId ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_EXIT ); } /*! @@ -143,6 +145,7 @@ */ WlanWizardPrivate::~WlanWizardPrivate() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_ENTRY ); OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_DWLANWIZARDPRIVATE, "WlanWizardPrivate::~WlanWizardPrivate;this=%x", this ); @@ -178,6 +181,7 @@ OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_DWLANWIZARDPRIVATE_DONE, "WlanWizardPrivate::~WlanWizardPrivate-Done;this=%x", this ); + OstTraceFunctionExit0( DUP1_WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_EXIT ); } /*! @@ -191,6 +195,7 @@ bool hidden, bool wps) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_SETPARAMETERS_ENTRY ); OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_SETPARAMETERS, "WlanWizardPrivate::setParameters;this=%x", this ); @@ -201,6 +206,7 @@ OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_SETPARAMETERS_DONE, "WlanWizardPrivate::setParameters - Done;this=%x", this ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_SETPARAMETERS_EXIT ); } /*! @@ -208,6 +214,7 @@ */ void WlanWizardPrivate::show() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_SHOW_ENTRY ); OstTraceExt2( TRACE_BORDER, WLANWIZARDPRIVATE_SHOW, "WlanWizardPrivate::show;this=%x;mFirstPageId=%{PageIds}", ( unsigned )this, mFirstPageId ); @@ -219,6 +226,7 @@ OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_SHOW_DONE, "WlanWizardPrivate::show - Done;this=%x;", (unsigned)this ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_SHOW_EXIT ); } /*! @@ -236,6 +244,7 @@ bool hidden, bool wps) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_GETNEXTPAGEID_ENTRY ); setConfiguration(ConfProcessSettings, true); setConfiguration(ConfSsid, ssid); setConfiguration(ConfNetworkMode, networkMode); @@ -246,7 +255,7 @@ OstTrace1( TRACE_NORMAL, WLANWIZARDPRIVATE_GETNEXTPAGEID, "WlanWizardPrivate::getNextPageId;wps=%u", wps ); - + OstTraceFunctionExit0( WLANWIZARDPRIVATE_GETNEXTPAGEID_EXIT ); return nextPageId(wps); } @@ -257,7 +266,9 @@ */ WlanQtUtils* WlanWizardPrivate::wlanQtUtils() const { - Q_ASSERT(mWlanQtUtils); + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_WLANQTUTILS_ENTRY ); + Q_ASSERT(mWlanQtUtils.data()); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_WLANQTUTILS_EXIT ); return mWlanQtUtils.data(); } @@ -268,6 +279,7 @@ */ WlanWizardPlugin* WlanWizardPrivate::wlanWizardPlugin() const { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_WLANWIZARDPLUGIN_ENTRY ); WlanWizardPlugin* plugin = NULL; if (isEapEnabled()) { @@ -279,6 +291,7 @@ "WlanWizardPrivate::wlanWizardPlugin;plugin=%x", plugin ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_WLANWIZARDPLUGIN_EXIT ); return plugin; } @@ -290,6 +303,7 @@ */ bool WlanWizardPrivate::isEapEnabled() const { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ISEAPENABLED_ENTRY ); bool ret = false; int secMode = configuration(ConfSecurityMode).toInt(); @@ -304,6 +318,7 @@ "WlanWizardPrivate::isEapEnabled;ret=%u", ret ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_ISEAPENABLED_EXIT ); return ret; } @@ -314,6 +329,7 @@ */ bool WlanWizardPrivate::handleIap() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_HANDLEIAP_ENTRY ); OstTrace0( TRACE_FLOW, WLANWIZARDPRIVATE_HANDLEIAP, "WlanWizardPrivate::handleIap" ); @@ -399,6 +415,7 @@ "WlanWizardPrivate::handleIap: Done;ret=%d", ret ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_HANDLEIAP_EXIT ); return ret; } @@ -407,6 +424,7 @@ */ QVariant WlanWizardPrivate::configuration(ConfigurationId confId) const { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CONFIGURATION_ENTRY ); Q_ASSERT(mConfigurations.contains(confId)); #ifdef OST_TRACE_COMPILER_IN_USE @@ -420,6 +438,7 @@ (uint)confId, string ); #endif + OstTraceFunctionExit0( WLANWIZARDPRIVATE_CONFIGURATION_EXIT ); return mConfigurations[confId]; } @@ -430,6 +449,7 @@ ConfigurationId confId, const QVariant &value) { +OstTraceFunctionEntry0( WLANWIZARDPRIVATE_SETCONFIGURATION_ENTRY ); #ifdef OST_TRACE_COMPILER_IN_USE QString tmp; QDebug tmpStream(&tmp); @@ -443,6 +463,7 @@ #endif mConfigurations[confId] = value; + OstTraceFunctionExit0( WLANWIZARDPRIVATE_SETCONFIGURATION_EXIT ); } /*! @@ -450,11 +471,13 @@ */ void WlanWizardPrivate::clearConfiguration(ConfigurationId confId) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CLEARCONFIGURATION_ENTRY ); OstTrace1( TRACE_FLOW, WLANWIZARDPRIVATE_CLEARCONFIGURATION, "WlanWizardPrivate::clearConfiguration;confId=%{ConfigurationId}", (uint)confId ); mConfigurations.remove(confId); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_CLEARCONFIGURATION_EXIT ); } /*! @@ -462,10 +485,11 @@ */ bool WlanWizardPrivate::configurationExists(ConfigurationId confId) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CONFIGURATIONEXISTS_ENTRY ); OstTrace1( TRACE_DUMP, WLANWIZARDPRIVATE_CONFIGURATIONEXISTS, "WlanWizardPrivate::configurationExists;confId=%{ConfigurationId}", (uint)confId ); - + OstTraceFunctionExit0( WLANWIZARDPRIVATE_CONFIGURATIONEXISTS_EXIT ); return mConfigurations[confId].isValid(); } @@ -474,10 +498,12 @@ */ void WlanWizardPrivate::enableNextButton(bool enable) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ENABLENEXTBUTTON_ENTRY ); OstTraceExt2( TRACE_FLOW, WLANWIZARDPRIVATE_ENABLENEXTBUTTON, "WlanWizardPrivate::enableNextButton;this=%x;enable=%x", (unsigned)this, (uint)enable ); mActionNext->setEnabled(enable); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_ENABLENEXTBUTTON_EXIT ); } /*! @@ -485,12 +511,14 @@ */ void WlanWizardPrivate::addPage(int pageId, WlanWizardPage *page) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ADDPAGE_ENTRY ); OstTraceExt3( TRACE_FLOW, WLANWIZARDPRIVATE_ADDPAGE, "WlanWizardPrivate::addPage;this=%x;pageId=%{PageIds};page=%x", (unsigned)this, pageId, (uint)(page) ); Q_ASSERT(!mPages.contains(pageId)); mPages[pageId] = page; + OstTraceFunctionExit0( WLANWIZARDPRIVATE_ADDPAGE_EXIT ); } /*! @@ -498,12 +526,14 @@ */ void WlanWizardPrivate::nextPage() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_NEXTPAGE_ENTRY ); OstTrace1( TRACE_FLOW, WLANWIZARDPRIVATE_NEXTPAGE, "WlanWizardPrivate::nextPage;this=%x", this ); mPageFinished = true; toNextPage(); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_NEXTPAGE_EXIT ); } /*! @@ -511,6 +541,8 @@ */ HbMainWindow* WlanWizardPrivate::mainWindow() const { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_MAINWINDOW_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_MAINWINDOW_EXIT ); return mMainWindow; } @@ -519,6 +551,7 @@ */ bool WlanWizardPrivate::isCurrentPage(const HbWidget *page) const { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ISCURRENTPAGE_ENTRY ); bool ret = false; if (mStackedWidget->currentWidget() == page) { ret = true; @@ -528,6 +561,7 @@ "WlanWizardPrivate::isCurrentPage;page=%x;ret=%d", (uint)page, ret); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_ISCURRENTPAGE_EXIT ); return ret; } @@ -536,6 +570,7 @@ */ int WlanWizardPrivate::nextPageId(bool useWps) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_NEXTPAGEID_ENTRY ); int ret; if (useWps) { ret = WlanWizardPage::PageWpsStart; @@ -574,6 +609,7 @@ "WlanWizardPrivate::nextPageId;this=%x;useWps=%x;ret=%{PageIds}", ( unsigned )this, ( TUint )( useWps ), ret ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_NEXTPAGEID_EXIT ); return ret; } @@ -586,6 +622,7 @@ */ void WlanWizardPrivate::cancelTriggered() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CANCELTRIGGERED_ENTRY ); OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_CANCELTRIGGERED, "WlanWizardPrivate::cancelTriggered;this=%x", this ); @@ -620,6 +657,7 @@ OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_CANCELTRIGGERED_DONE, "WlanWizardPrivate::cancelTriggered - Done;this=%x", this ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_CANCELTRIGGERED_EXIT ); } /*! @@ -629,6 +667,7 @@ */ void WlanWizardPrivate::previousTriggered() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_ENTRY ); OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_PREVIOUSTRIGGERED, "WlanWizardPrivate::previousTriggered;this=%x", this ); @@ -661,6 +700,7 @@ OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_DONE, "WlanWizardPrivate::previousTriggered - Done;this=%x", this ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_EXIT ); } /*! @@ -669,6 +709,7 @@ */ void WlanWizardPrivate::nextTriggered() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_NEXTTRIGGERED_ENTRY ); OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_NEXTTRIGGERED, "WlanWizardPrivate::nextTriggered;this=%x", this ); @@ -685,6 +726,7 @@ OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_NEXTTRIGGERED_DONE, "WlanWizardPrivate::nextTriggered - Done;this=%x", this ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_NEXTTRIGGERED_EXIT ); } /*! @@ -693,6 +735,7 @@ */ void WlanWizardPrivate::finishTriggered() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_FINISHTRIGGERED_ENTRY ); OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_FINISHTRIGGERED, "WlanWizardPrivate::finishTriggered;this=%x", this ); @@ -711,6 +754,7 @@ OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_FINISHTRIGGERED_DONE, "WlanWizardPrivate::finishTriggered - Done;this=%x", this ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_FINISHTRIGGERED_EXIT ); } /*! @@ -719,6 +763,7 @@ */ void WlanWizardPrivate::onTimeOut() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ONTIMEOUT_ENTRY ); OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_ONTIMEOUT, "WlanWizardPrivate::onTimeOut;this=%x", this ); @@ -728,6 +773,7 @@ OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_ONTIMEOUT_DONE, "WlanWizardPrivate::onTimeOut - Done;this=%x", this ); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_ONTIMEOUT_EXIT ); } /*! @@ -736,6 +782,7 @@ */ void WlanWizardPrivate::startPageOperation() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_STARTPAGEOPERATION_ENTRY ); // Process this if wizard has not been closed if (mClosed == false) { OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_STARTPAGEOPERATION, @@ -753,6 +800,7 @@ "WlanWizardPrivate::startPageOperation - DONE;this=%x", this ); } + OstTraceFunctionExit0( WLANWIZARDPRIVATE_STARTPAGEOPERATION_EXIT ); } /*! @@ -761,6 +809,7 @@ */ void WlanWizardPrivate::toNextPage() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_TONEXTPAGE_ENTRY ); if (mPageFinished && !(mPageTimer->isActive())) { OstTrace1( TRACE_FLOW, WLANWIZARDPRIVATE_TONEXTPAGE, "WlanWizardPrivate::toNextPage;this=%x", @@ -770,6 +819,7 @@ // call stack and process the page change using new call stack QMetaObject::invokeMethod(this, "nextTriggered", Qt::QueuedConnection); } + OstTraceFunctionExit0( WLANWIZARDPRIVATE_TONEXTPAGE_EXIT ); } /*! @@ -784,6 +834,7 @@ */ void WlanWizardPrivate::showPage(int pageId, bool removeFromStack) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_SHOWPAGE_ENTRY ); OstTraceExt3( TRACE_FLOW, WLANWIZARDPRIVATE_SHOWPAGE, "WlanWizardPrivate::showPage;this=%x;" "pageId=%{PageIds};removeFromStack=%x", @@ -792,6 +843,7 @@ // PageNone is returned by wizard pages when some validation of page content // has not passed and the page does not want to process wizard to next page if (pageId == WlanWizardPage::PageNone) { + OstTraceFunctionExit0( WLANWIZARDPRIVATE_SHOWPAGE_EXIT ); return; } @@ -854,6 +906,7 @@ QMetaObject::invokeMethod(this, "startPageOperation", Qt::QueuedConnection); } + OstTraceFunctionExit0( DUP1_WLANWIZARDPRIVATE_SHOWPAGE_EXIT ); } /*! @@ -862,6 +915,7 @@ */ void WlanWizardPrivate::createPages() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CREATEPAGES_ENTRY ); OstTrace0( TRACE_NORMAL, WLANWIZARDPRIVATE_CREATEPAGES, @@ -898,6 +952,7 @@ addPage( WlanWizardPageInternal::PageNetworkSecurity, new WlanWizardPageSecurityMode(this)); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_CREATEPAGES_EXIT ); } /*! @@ -907,8 +962,10 @@ */ void WlanWizardPrivate::closeViews() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CLOSEVIEWS_ENTRY ); mDialog->hide(); mClosed = true; + OstTraceFunctionExit0( WLANWIZARDPRIVATE_CLOSEVIEWS_EXIT ); } /*! @@ -920,6 +977,7 @@ */ void WlanWizardPrivate::updateFrame(int pageId) { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_UPDATEFRAME_ENTRY ); int currentIndex = mStackedWidget->currentIndex(); OstTraceExt3( TRACE_FLOW, WLANWIZARDPRIVATE_UPDATEFRAME, @@ -952,6 +1010,7 @@ } } } + OstTraceFunctionExit0( WLANWIZARDPRIVATE_UPDATEFRAME_EXIT ); } /*! @@ -959,6 +1018,7 @@ */ void WlanWizardPrivate::loadDocml() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_LOADDOCML_ENTRY ); bool ok = true; mDocLoader->load(":/docml/occ_wlan_wizard_main.docml", &ok); @@ -1030,6 +1090,7 @@ // is changed. See TSW Error: MTAA-854DK8 ok = HbStyleLoader::registerFilePath(":/css/custom.css"); Q_ASSERT(ok); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_LOADDOCML_EXIT ); } /*! @@ -1037,6 +1098,7 @@ */ void WlanWizardPrivate::disconnectActions() { + OstTraceFunctionEntry0( WLANWIZARDPRIVATE_DISCONNECTACTIONS_ENTRY ); disconnect( mActionNext, SIGNAL(triggered()), this, SLOT(nextTriggered())); @@ -1052,4 +1114,5 @@ disconnect( mActionCancel, SIGNAL(triggered()), this, SLOT(cancelTriggered())); + OstTraceFunctionExit0( WLANWIZARDPRIVATE_DISCONNECTACTIONS_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpagegenericerror.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpagegenericerror.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpagegenericerror.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -28,6 +28,11 @@ #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "wlanwizardpageprocessingsettingsTraces.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "wlanwizardpagegenericerrorTraces.h" +#endif + #endif /*! @@ -58,6 +63,8 @@ mWidget(NULL), mLabel(NULL) { + OstTraceFunctionEntry0( WLANWIZARDPAGEGENERICERROR_WLANWIZARDPAGEGENERICERROR_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGEGENERICERROR_WLANWIZARDPAGEGENERICERROR_EXIT ); } /*! @@ -65,7 +72,9 @@ */ WlanWizardPageGenericError::~WlanWizardPageGenericError() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGEGENERICERROR_WLANWIZARDPAGEGENERICERROR_ENTRY ); // signals are automatically disconnected + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEGENERICERROR_WLANWIZARDPAGEGENERICERROR_EXIT ); } /*! @@ -73,6 +82,7 @@ */ HbWidget* WlanWizardPageGenericError::initializePage() { + OstTraceFunctionEntry0( WLANWIZARDPAGEGENERICERROR_INITIALIZEPAGE_ENTRY ); // Create the visualization at the first time if (!mWidget) { HbDocumentLoader docLoader(mWizard->mainWindow()); @@ -93,6 +103,7 @@ mWizard->configuration( WlanWizardHelper::ConfGenericErrorString).toString()); + OstTraceFunctionExit0( WLANWIZARDPAGEGENERICERROR_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -103,6 +114,8 @@ */ bool WlanWizardPageGenericError::showPage() { + OstTraceFunctionEntry0( WLANWIZARDPAGEGENERICERROR_SHOWPAGE_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGEGENERICERROR_SHOWPAGE_EXIT ); return false; } @@ -113,6 +126,8 @@ */ int WlanWizardPageGenericError::previousTriggered() { + OstTraceFunctionEntry0( WLANWIZARDPAGEGENERICERROR_PREVIOUSTRIGGERED_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGEGENERICERROR_PREVIOUSTRIGGERED_EXIT ); return mWizard->configuration( WlanWizardHelper::ConfGenericErrorPageStepsBackwards).toInt(); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpageinternal.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpageinternal.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpageinternal.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -24,6 +24,11 @@ // User includes #include "wlanwizard_p.h" #include "wlanwizardpageinternal.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "wlanwizardpageinternalTraces.h" +#endif + /*! \class WlanWizardPageInternal @@ -48,6 +53,8 @@ QObject(wizard), mWizard(wizard) { + OstTraceFunctionEntry0( WLANWIZARDPAGEINTERNAL_WLANWIZARDPAGEINTERNAL_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGEINTERNAL_WLANWIZARDPAGEINTERNAL_EXIT ); } /*! @@ -55,6 +62,8 @@ */ WlanWizardPageInternal::~WlanWizardPageInternal() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGEINTERNAL_WLANWIZARDPAGEINTERNAL_ENTRY ); + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEINTERNAL_WLANWIZARDPAGEINTERNAL_EXIT ); } @@ -74,6 +83,7 @@ const QString &portraitSection, const QString &landscapeSection) const { + OstTraceFunctionEntry0( WLANWIZARDPAGEINTERNAL_LOADDOCMLSECTION_ENTRY ); bool ok; // Then load the orientation specific section @@ -85,4 +95,5 @@ loader->load(filename, portraitSection, &ok); Q_ASSERT(ok); } + OstTraceFunctionExit0( WLANWIZARDPAGEINTERNAL_LOADDOCMLSECTION_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpagekeyquery.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpagekeyquery.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpagekeyquery.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -30,6 +30,11 @@ #include "wlanwizard_p.h" #include "wlanwizardpagekeyquery.h" #include "wlanwizardutils.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "wlanwizardpagekeyqueryTraces.h" +#endif + /*! \class WlanWizardPageKeyQuery @@ -58,6 +63,8 @@ mLabelError(NULL), mDocLoader(NULL) { + OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_EXIT ); } /*! @@ -65,9 +72,11 @@ */ WlanWizardPageKeyQuery::~WlanWizardPageKeyQuery() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_ENTRY ); delete mDocLoader; // Wizard framework deletes the visualization (owns mWidget). + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_EXIT ); } /*! @@ -78,6 +87,7 @@ */ HbWidget* WlanWizardPageKeyQuery::initializePage() { + OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_INITIALIZEPAGE_ENTRY ); if (!mWidget) { bool ok; @@ -126,10 +136,10 @@ } mLabelTitle->setPlainText( - HbParameterLengthLimiter( - hbTrId("txt_occ_dialog_enter_key_for_1")).arg( - mWizard->configuration(WlanWizardPrivate::ConfSsid).toString())); + HbParameterLengthLimiter("txt_occ_dialog_enter_key_for_1").arg( + mWizard->configuration(WlanWizardPrivate::ConfSsid).toString())); + OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -141,12 +151,14 @@ */ void WlanWizardPageKeyQuery::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_LOADDOCMLSECTION_ENTRY ); WlanWizardPageInternal::loadDocmlSection( mDocLoader, orientation, ":/docml/occ_add_wlan_01_04.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_LOADDOCMLSECTION_EXIT ); } /*! @@ -163,6 +175,7 @@ */ int WlanWizardPageKeyQuery::nextId(bool &removeFromStack) const { + OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_NEXTID_ENTRY ); WlanWizardUtils::KeyStatus status(WlanWizardUtils::KeyStatusOk); int pageId = WlanWizardPage::nextId(removeFromStack); int secMode = mWizard->configuration( @@ -198,6 +211,7 @@ } removeFromStack = false; + OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_NEXTID_EXIT ); return pageId; } @@ -206,9 +220,11 @@ */ bool WlanWizardPageKeyQuery::showPage() { + OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_SHOWPAGE_ENTRY ); // Open virtual keyboard by setting focus to line edit mLineEdit->setFocus(); + OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_SHOWPAGE_EXIT ); return true; } @@ -223,9 +239,11 @@ */ bool WlanWizardPageKeyQuery::eventFilter(QObject *obj, QEvent *event) { + OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_EVENTFILTER_ENTRY ); if (obj == mLineEdit && event->type() == QEvent::FocusIn) { mLabelError->setPlainText(""); } + OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_EVENTFILTER_EXIT ); return false; } @@ -240,6 +258,7 @@ QString WlanWizardPageKeyQuery::keyStatusToErrorString( WlanWizardUtils::KeyStatus status) const { + OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_KEYSTATUSTOERRORSTRING_ENTRY ); QString errorString; switch (status) { case WlanWizardUtils::KeyStatusIllegalCharacters: @@ -259,5 +278,6 @@ // nothing to do here. break; } + OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_KEYSTATUSTOERRORSTRING_EXIT ); return errorString; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpagenetworkmode.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpagenetworkmode.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpagenetworkmode.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -49,6 +49,8 @@ mLoader(NULL), mValid(false) { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_WLANWIZARDPAGENETWORKMODE_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGENETWORKMODE_WLANWIZARDPAGENETWORKMODE_EXIT ); } /*! @@ -57,7 +59,9 @@ */ WlanWizardPageNetworkMode::~WlanWizardPageNetworkMode() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGENETWORKMODE_WLANWIZARDPAGENETWORKMODE_ENTRY ); delete mLoader; + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGENETWORKMODE_WLANWIZARDPAGENETWORKMODE_EXIT ); } /*! @@ -66,6 +70,7 @@ */ HbWidget* WlanWizardPageNetworkMode::initializePage() { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_INITIALIZEPAGE_ENTRY ); OstTrace0( TRACE_NORMAL, WLANWIZARDPAGENETWORKMODE_INITIALIZEPAGE, "WlanWizardPageNetworkMode::initializePage" ); @@ -110,6 +115,7 @@ mList->setItems(items); + OstTraceFunctionExit0( WLANWIZARDPAGENETWORKMODE_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -121,25 +127,35 @@ */ int WlanWizardPageNetworkMode::nextId(bool &removeFromStack) const { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_NEXTID_ENTRY ); removeFromStack = false; WlanNetworkSetting setting; - setting.mode = mNetworkModes.at(mList->selected()); - setting.hidden = mIsHidden.at(mList->selected()); - - // TODO: Still no wps handling. - setting.wpsSupported = false; - - mWizard->setConfiguration(WlanWizardPrivate::ConfNetworkMode, - setting.mode); + int index = mList->selected(); + int nextPage = WlanWizardPageInternal::PageNetworkSecurity; - mWizard->setConfiguration(WlanWizardPrivate::ConfHiddenWlan, - setting.hidden); + if (mWpsSupported.at(index)) { + nextPage = WlanWizardPageInternal::PageWpsStart; + } + else { + setting.mode = mNetworkModes.at(index); + setting.hidden = mIsHidden.at(index); + setting.wpsSupported = mWpsSupported.at(index); + + mWizard->setConfiguration(WlanWizardPrivate::ConfNetworkMode, + setting.mode); - if (mWizard->configurationExists(WlanWizardPrivate::ConfAvailableNetworkOptions)) { - return selectNextPage(setting); + mWizard->setConfiguration(WlanWizardPrivate::ConfHiddenWlan, + setting.hidden); + + mWizard->setConfiguration(WlanWizardPrivate::ConfWpsSupported, + setting.wpsSupported); + + if (mWizard->configurationExists(WlanWizardPrivate::ConfAvailableNetworkOptions)) { + nextPage = selectNextPage(setting); + } } - - return WlanWizardPageInternal::PageNetworkSecurity; + OstTraceFunctionExit0( WLANWIZARDPAGENETWORKMODE_NEXTID_EXIT ); + return nextPage; } /*! @@ -149,6 +165,8 @@ */ bool WlanWizardPageNetworkMode::showPage() { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_SHOWPAGE_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGENETWORKMODE_SHOWPAGE_EXIT ); return mValid; } @@ -158,11 +176,13 @@ */ void WlanWizardPageNetworkMode::itemSelected() { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_ITEMSELECTED_ENTRY ); OstTrace0( TRACE_BORDER, WLANWIZARDPAGENETWORKMODE_ITEMSELECTED, "WlanWizardPageNetworkMode::itemSelected" ); mValid = true; mWizard->enableNextButton(mValid); + OstTraceFunctionExit0( WLANWIZARDPAGENETWORKMODE_ITEMSELECTED_EXIT ); } /*! @@ -173,6 +193,7 @@ */ void WlanWizardPageNetworkMode::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_LOADDOCMLSECTION_ENTRY ); OstTrace1( TRACE_NORMAL, WLANWIZARDPAGENETWORKMODE_LOADDOCML, "WlanWizardPageNetworkMode::loadDocml - Orientation;orientation=%x", ( TUint )( orientation ) ); @@ -183,6 +204,7 @@ ":/docml/occ_add_wlan_02_03.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( WLANWIZARDPAGENETWORKMODE_LOADDOCMLSECTION_EXIT ); } /*! @@ -195,10 +217,16 @@ * @param [in] item is the caption to be added. * @param [in] mode is the network mode to be added. * @param [in] isHidden is the visibility status of the network. + * @param [in] wpsSupported is the possibility for wps support. */ -void WlanWizardPageNetworkMode::addToList(QStringList &list, - const QString &item, int mode, bool isHidden) +void WlanWizardPageNetworkMode::addToList( + QStringList &list, + const QString &item, + int mode, + bool isHidden, + bool wpsSupported) { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_ADDTOLIST_ENTRY ); if (mWizard->configurationExists(WlanWizardHelper::ConfAvailableNetworkOptions)) { WlanWizardScanList networkOptions = mWizard->configuration( @@ -207,18 +235,26 @@ QList modes = networkOptions.getNetModes(); for (int i = 0; i < modes.size(); i++) { - if (modes[i].mode == mode && modes[i].hidden == isHidden) { + if ( (modes[i].mode == mode + && modes[i].hidden == isHidden + && modes[i].wpsSupported == wpsSupported) + || (modes[i].wpsSupported && wpsSupported) ) { list << item; mNetworkModes.append(mode); mIsHidden.append(isHidden); + mWpsSupported.append(wpsSupported); } } } - else { + else { list << item; mNetworkModes.append(mode); mIsHidden.append(isHidden); + // If there are no known network options, WPS is not allowed to be + // selected. + mWpsSupported.append(false); } + OstTraceFunctionExit0( WLANWIZARDPAGENETWORKMODE_ADDTOLIST_EXIT ); } /*! @@ -227,9 +263,11 @@ */ void WlanWizardPageNetworkMode::populateRadioButtonList(QStringList &list) { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_POPULATERADIOBUTTONLIST_ENTRY ); list.clear(); mNetworkModes.clear(); mIsHidden.clear(); + mWpsSupported.clear(); // A list is created. Since there is no practical way of knowing whether // the new contents are different from the previous contents (if there @@ -237,13 +275,21 @@ mValid = false; addToList(list, hbTrId("txt_occ_dblist_val_infrastructure_public"), - CMManagerShim::Infra, false); + CMManagerShim::Infra, false, false); addToList(list, hbTrId("txt_occ_list_infrastructure_hidden"), - CMManagerShim::Infra, true); + CMManagerShim::Infra, true, false); addToList(list, hbTrId("txt_occ_list_adhoc_1"), CMManagerShim::Adhoc, - false); + false, false); + + if (mWizard->configurationExists(WlanWizardHelper::ConfAvailableNetworkOptions)) { + // addToList with wpsSupported=true is only called, when there are available + // scan result options. If no network options exist, the user can not get to + // wps wizard from this view. Also, mode and isHidden are "don't care". + addToList(list, hbTrId("txt_occ_list_wifi_protected_setup"), NetworkModeNone, false, true); + } + OstTraceFunctionExit0( WLANWIZARDPAGENETWORKMODE_POPULATERADIOBUTTONLIST_EXIT ); } /*! @@ -254,17 +300,21 @@ */ int WlanWizardPageNetworkMode::selectNextPage(const WlanNetworkSetting &setting) const { + OstTraceFunctionEntry0( WLANWIZARDPAGENETWORKMODE_SELECTNEXTPAGE_ENTRY ); + + int nextPage = WlanWizardPageInternal::PageNetworkSecurity; + WlanWizardScanList networkOptions = mWizard->configuration( WlanWizardHelper::ConfAvailableNetworkOptions).value(); - + if (networkOptions.secModes(setting) == SingleResult) { WlanSecuritySetting secMode = networkOptions.getSecMode(setting); - mWizard->setConfiguration(WlanWizardHelper::ConfSecurityMode, secMode.mode); mWizard->setConfiguration(WlanWizardHelper::ConfUsePsk, secMode.usePsk); - return secMode.nextPageId; + nextPage = secMode.nextPageId; } - return WlanWizardPageInternal::PageNetworkSecurity; + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGENETWORKMODE_SELECTNEXTPAGE_EXIT ); + return nextPage; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpageprocessingsettings.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpageprocessingsettings.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpageprocessingsettings.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -66,6 +66,7 @@ mLabel(NULL), mNextPageId(WlanWizardPageInternal::PageSummary) { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_ENTRY ); WlanQtUtils* utils = mWizard->wlanQtUtils(); bool ok; @@ -92,6 +93,7 @@ Q_UNUSED(ok); Q_ASSERT(ok); + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_EXIT ); } /*! @@ -99,10 +101,12 @@ */ WlanWizardPageProcessingSettings::~WlanWizardPageProcessingSettings() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_ENTRY ); // signals are automatically disconnected delete mDocLoader; // Wizard framework deletes the visualization (owns mWidget). + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_EXIT ); } /*! @@ -110,6 +114,7 @@ */ HbWidget* WlanWizardPageProcessingSettings::initializePage() { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_INITIALIZEPAGE_ENTRY ); if (!mWidget) { mDocLoader = new HbDocumentLoader(mWizard->mainWindow()); @@ -132,9 +137,10 @@ mLabel->setPlainText( HbParameterLengthLimiter( - hbTrId("txt_occ_dialog_checking_connection_to_1")).arg( + "txt_occ_dialog_checking_connection_to_1").arg( mWizard->configuration(WlanWizardPrivate::ConfSsid).toString())); + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -147,7 +153,9 @@ */ int WlanWizardPageProcessingSettings::nextId(bool &removeFromStack) const { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_NEXTID_ENTRY ); removeFromStack = true; + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_NEXTID_EXIT ); return mNextPageId; } @@ -159,6 +167,8 @@ */ bool WlanWizardPageProcessingSettings::showPage() { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_SHOWPAGE_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_SHOWPAGE_EXIT ); return false; } @@ -170,12 +180,14 @@ */ void WlanWizardPageProcessingSettings::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_LOADDOCMLSECTION_ENTRY ); WlanWizardPageInternal::loadDocmlSection( mDocLoader, orientation, ":/docml/occ_add_wlan_06.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_LOADDOCMLSECTION_EXIT ); } /*! @@ -189,12 +201,14 @@ */ void WlanWizardPageProcessingSettings::wlanNetworkClosed(int iapId, int reason) { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_ENTRY ); OstTraceExt2( TRACE_BORDER, WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED, "WlanWizardPageProcessingSettings::wlanNetworkClosed;iapId=%d;reason=%d", iapId, reason ); if (iapId != mWizard->configuration(WlanWizardHelper::ConfIapId).toInt()) { + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_EXIT ); return; } @@ -250,6 +264,7 @@ OstTrace0( TRACE_BORDER, WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_DONE, "WlanWizardPageProcessingSettings::wlanNetworkClosed - Done" ); + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_EXIT ); } /*! @@ -261,6 +276,7 @@ */ void WlanWizardPageProcessingSettings::ictResult(int iapId, int reason) { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_ENTRY ); OstTraceExt2( TRACE_BORDER, WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT, @@ -268,6 +284,7 @@ iapId, reason ); if (iapId != mWizard->configuration(WlanWizardHelper::ConfIapId).toInt()) { + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_EXIT ); return; } @@ -289,6 +306,7 @@ OstTrace0( TRACE_BORDER, WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_DONE, "WlanWizardPageProcessingSettings::ictResult - Done" ); + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_EXIT ); } /*! @@ -298,12 +316,14 @@ */ void WlanWizardPageProcessingSettings::wlanNetworkOpened(int iapId) { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKOPENED_ENTRY ); Q_UNUSED(iapId); OstTrace1( TRACE_BORDER, WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKOPENED, "WlanWizardPageProcessingSettings::wlanNetworkOpened;iapId=%d", iapId); + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKOPENED_EXIT ); } /*! @@ -313,6 +333,8 @@ */ bool WlanWizardPageProcessingSettings::requiresStartOperation() { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_REQUIRESSTARTOPERATION_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_REQUIRESSTARTOPERATION_EXIT ); return true; } @@ -323,6 +345,7 @@ */ void WlanWizardPageProcessingSettings::startOperation() { + OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_STARTOPERATION_ENTRY ); if (mWizard->handleIap()) { mNextPageId = WlanWizardPageInternal::PageSummary; @@ -347,4 +370,5 @@ WlanWizardPage::OneStepBackwards); mWizard->nextPage(); } + OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_STARTOPERATION_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpagescanning.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpagescanning.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpagescanning.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -49,6 +49,7 @@ mScanResultsAvailable(false), mScanStatus(WlanQtUtils::ScanStatusOk) { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_ENTRY ); WlanQtUtils* utils = mWizard->wlanQtUtils(); // Connect normal scan completion signal from wlanQtUtils to result @@ -61,6 +62,7 @@ SLOT(wlanScanResultPreCheck(int))); Q_ASSERT(ok); + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_EXIT ); } /*! @@ -69,7 +71,9 @@ */ WlanWizardPageScanning::~WlanWizardPageScanning() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_ENTRY ); delete mLoader; + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_EXIT ); } /*! @@ -79,6 +83,7 @@ */ HbWidget* WlanWizardPageScanning::initializePage() { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_INITIALIZEPAGE_ENTRY ); OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_INITIALIZEPAGE, @@ -128,10 +133,10 @@ } mLabel->setPlainText(HbParameterLengthLimiter( - hbTrId("txt_occ_dialog_searching")).arg(mWizard->configuration( + "txt_occ_dialog_searching").arg(mWizard->configuration( WlanWizardPrivate::ConfSsid).toString())); - + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -143,8 +148,10 @@ */ int WlanWizardPageScanning::nextId(bool &removeFromStack) const { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_NEXTID_ENTRY ); removeFromStack = true; + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_NEXTID_EXIT ); return mNextPageId; } @@ -158,6 +165,7 @@ */ int WlanWizardPageScanning::previousTriggered() { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_PREVIOUSTRIGGERED_ENTRY ); disconnect(this, SLOT(wlanScanDirectReady(int))); disconnect(this, SLOT(wlanScanResultPreCheck(int))); @@ -179,6 +187,7 @@ SLOT(wlanScanDirectReady(int))); Q_ASSERT(ok); + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_PREVIOUSTRIGGERED_EXIT ); return OneStepBackwards; } @@ -193,7 +202,9 @@ */ bool WlanWizardPageScanning::showPage() { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_SHOWPAGE_ENTRY ); mWizard->setConfiguration(WlanWizardHelper::ConfProcessSettings, false); + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_SHOWPAGE_EXIT ); return false; } @@ -205,6 +216,8 @@ */ bool WlanWizardPageScanning::requiresStartOperation() { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_REQUIRESSTARTOPERATION_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_REQUIRESSTARTOPERATION_EXIT ); return true; } @@ -214,6 +227,7 @@ */ void WlanWizardPageScanning::startOperation() { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_STARTOPERATION_ENTRY ); OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_STARTOPERATION, "WlanWizardPageScanning::startOperation - start AP scan if results" " are available." ); @@ -222,6 +236,7 @@ mScanResultsAvailable = false; wlanScanApReady(); } + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_STARTOPERATION_EXIT ); } /*! @@ -232,6 +247,7 @@ */ void WlanWizardPageScanning::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_LOADDOCMLSECTION_ENTRY ); OstTrace1( TRACE_NORMAL, WLANWIZARDPAGESCANNING_LOADDOCML, "WlanWizardPageScanning::loadDocml - orientation ;orientation=%x", ( TUint )( orientation ) ); @@ -242,6 +258,7 @@ ":/docml/occ_add_wlan_06.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_LOADDOCMLSECTION_EXIT ); } /*! @@ -252,6 +269,7 @@ */ void WlanWizardPageScanning::wlanScanResultPreCheck(int scanStatus) { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK_ENTRY ); mScanStatus = scanStatus; if (!mWidget) { @@ -276,6 +294,7 @@ mScanResultsAvailable = true; } } + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK_EXIT ); } /*! @@ -285,6 +304,7 @@ */ void WlanWizardPageScanning::wlanScanDirectReady(int scanStatus) { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY_ENTRY ); OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY, "WlanWizardPageScanning::wlanScanDirectReady" ); @@ -306,6 +326,7 @@ // 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 ); } /*! @@ -316,6 +337,7 @@ */ void WlanWizardPageScanning::wlanScanApReady() { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANAPREADY_ENTRY ); OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_WLANSCANAPREADY, "WlanWizardPageScanning::wlanScanApReady" ); @@ -343,6 +365,7 @@ mNextPageId = WlanWizardPageInternal::PageNetworkMode; mWizard->nextPage(); } + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANSCANAPREADY_EXIT ); } /*! @@ -355,6 +378,7 @@ QString ssid, const QList > &matchList) { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_GETSSIDMATCHLIST_ENTRY ); mWlanApList.clear(); QSharedPointer item; @@ -364,6 +388,7 @@ mWlanApList.append(item); } } + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_GETSSIDMATCHLIST_EXIT ); } /* @@ -378,6 +403,7 @@ const QList > &openScanResults, QList &finalResults) { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_GETFINALSCANRESULTS_ENTRY ); finalResults.clear(); // The key assumption of this algorithm is that both direct and public scan @@ -404,6 +430,7 @@ finalResults.append(resultItem); } + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_GETFINALSCANRESULTS_EXIT ); } /*! @@ -415,6 +442,7 @@ int WlanWizardPageScanning::processMultipleScanResults( const QList &finalResults) { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_PROCESSMULTIPLESCANRESULTS_ENTRY ); WlanWizardScanList networkOptions; int nextPage; @@ -427,9 +455,13 @@ mWizard->setConfiguration( WlanWizardHelper::ConfAvailableNetworkOptions, tmp); - // If there are more than one network mode choices, go to manual selection - // of network mode. - if (networkOptions.netModes() > SingleResult) { + if (networkOptions.wpsSelected()) { + // In case all available network mode options support wps, go directly + // 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 @@ -437,9 +469,11 @@ 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; } @@ -450,6 +484,7 @@ void WlanWizardPageScanning::selectNextPageActions( const QList &finalResults) { + OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_SELECTNEXTPAGEACTIONS_ENTRY ); mWizard->clearConfiguration(WlanWizardHelper::ConfAvailableNetworkOptions); if (finalResults.isEmpty()) { @@ -472,4 +507,5 @@ } mWizard->nextPage(); + OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_SELECTNEXTPAGEACTIONS_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpagesecuritymode.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpagesecuritymode.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpagesecuritymode.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -47,6 +47,8 @@ mLoader(NULL), mValid(false) { + OstTraceFunctionEntry0( WLANWIZARDPAGESECURITYMODE_WLANWIZARDPAGESECURITYMODE_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGESECURITYMODE_WLANWIZARDPAGESECURITYMODE_EXIT ); } /*! @@ -55,7 +57,9 @@ */ WlanWizardPageSecurityMode::~WlanWizardPageSecurityMode() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGESECURITYMODE_WLANWIZARDPAGESECURITYMODE_ENTRY ); delete mLoader; + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGESECURITYMODE_WLANWIZARDPAGESECURITYMODE_EXIT ); } /*! @@ -64,6 +68,7 @@ */ HbWidget* WlanWizardPageSecurityMode::initializePage() { + OstTraceFunctionEntry0( WLANWIZARDPAGESECURITYMODE_INITIALIZEPAGE_ENTRY ); OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESECURITYMODE_INITIALIZEPAGE, "WlanWizardPageSecurityMode::initializePage" ); @@ -108,6 +113,7 @@ // Create contents to the security mode radio button list. populateSecModeList(); + OstTraceFunctionExit0( WLANWIZARDPAGESECURITYMODE_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -120,6 +126,7 @@ */ int WlanWizardPageSecurityMode::nextId(bool &removeFromStack) const { + OstTraceFunctionEntry0( WLANWIZARDPAGESECURITYMODE_NEXTID_ENTRY ); removeFromStack = false; // The configuration is selected from the mSecModes list, which is ordered @@ -131,7 +138,7 @@ // during the page initialization. mWizard->setConfiguration( WlanWizardPrivate::ConfUsePsk, mUsePsk.at( mList->selected() ) ); - + OstTraceFunctionExit0( LANWIZARDPAGESECURITYMODE_NEXTID_EXIT ); return mPageIds.at( mList->selected() ); } @@ -142,6 +149,8 @@ */ bool WlanWizardPageSecurityMode::showPage() { + OstTraceFunctionEntry0( WLANWIZARDPAGESECURITYMODE_SHOWPAGE_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGESECURITYMODE_SHOWPAGE_EXIT ); return mValid; } @@ -151,11 +160,13 @@ */ void WlanWizardPageSecurityMode::itemSelected() { + OstTraceFunctionEntry0( WLANWIZARDPAGESECURITYMODE_ITEMSELECTED_ENTRY ); OstTrace0( TRACE_BORDER, WLANWIZARDPAGESECURITYMODE_ITEMSELECTED, "WlanWizardPageSecurityMode::itemSelected" ); mValid = true; mWizard->enableNextButton(mValid); + OstTraceFunctionExit0( WLANWIZARDPAGESECURITYMODE_ITEMSELECTED_EXIT ); } /*! @@ -166,6 +177,7 @@ */ void WlanWizardPageSecurityMode::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( WLANWIZARDPAGESECURITYMODE_LOADDOCMLSECTION_ENTRY ); OstTrace1( TRACE_NORMAL, WLANWIZARDPAGESECURITYMODE_LOADDOCML, "WlanWizardPageSecurityMode::loadDocml - orientation;orientation=%x", ( TUint )( orientation ) ); @@ -176,6 +188,7 @@ ":/docml/occ_add_wlan_02_03.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( WLANWIZARDPAGESECURITYMODE_LOADDOCMLSECTION_EXIT ); } /*! @@ -183,8 +196,9 @@ */ void WlanWizardPageSecurityMode::populateSecModeList() { + OstTraceFunctionEntry0( WLANWIZARDPAGESECURITYMODE_POPULATESECMODELIST_ENTRY ); QStringList items; - + mSecModes.clear(); mPageIds.clear(); mUsePsk.clear(); @@ -228,6 +242,8 @@ } mList->setItems(items); + + OstTraceFunctionExit0( WLANWIZARDPAGESECURITYMODE_POPULATESECMODELIST_EXIT ); } /*! @@ -245,20 +261,18 @@ void WlanWizardPageSecurityMode::addToList(QStringList &list, const QString &item, int mode, int page, bool psk) { + OstTraceFunctionEntry0( WLANWIZARDPAGESECURITYMODE_ADDTOLIST_ENTRY ); if (mWizard->configurationExists(WlanWizardHelper::ConfAvailableNetworkOptions)) { WlanNetworkSetting netMode; netMode.mode = mWizard->configuration(WlanWizardPrivate::ConfNetworkMode).toInt(); netMode.hidden = mWizard->configuration(WlanWizardPrivate::ConfHiddenWlan).toBool(); - - // wps always set to false at this point of the wizard. - netMode.wpsSupported = false; - + netMode.wpsSupported = mWizard->configuration(WlanWizardPrivate::ConfWpsSupported).toBool(); WlanWizardScanList networkOptions = mWizard->configuration( WlanWizardHelper::ConfAvailableNetworkOptions).value(); for (int i = 0; i < networkOptions.secModes(netMode); i++) { WlanSecuritySetting secMode = networkOptions.getSecMode(netMode, i); - + if (secMode.mode == mode && secMode.usePsk == psk) { list << item; mSecModes.append(mode); @@ -273,4 +287,5 @@ mPageIds.append(page); mUsePsk.append(psk); } + OstTraceFunctionExit0( WLANWIZARDPAGESECURITYMODE_ADDTOLIST_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpagessid.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpagessid.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpagessid.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -44,7 +44,9 @@ mSsid(NULL), mLoader(NULL) { + OstTraceFunctionEntry0( WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_EXIT ); } /*! @@ -53,7 +55,9 @@ */ WlanWizardPageSsid::~WlanWizardPageSsid() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_ENTRY ); delete mLoader; + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_EXIT ); } /*! @@ -62,6 +66,7 @@ */ HbWidget* WlanWizardPageSsid::initializePage() { + OstTraceFunctionEntry0( WLANWIZARDPAGESSID_INITIALIZEPAGE_ENTRY ); OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESSID_INITIALIZEPAGE, "WlanWizardPageSsid::initializePage" ); @@ -119,6 +124,7 @@ Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase); mSsid->setMaxLength(WlanWizardUtils::SsidMaxLength); + OstTraceFunctionExit0( WLANWIZARDPAGESSID_INITIALIZEPAGE_EXIT ); return mWidget; } @@ -129,12 +135,13 @@ */ bool WlanWizardPageSsid::showPage() { + OstTraceFunctionEntry0( WLANWIZARDPAGESSID_SHOWPAGE_ENTRY ); // Initiate the scanning of public APs here. mWizard->wlanQtUtils()->scanWlanAps(); // Open virtual keyboard by setting focus to line edit mSsid->setFocus(); - + OstTraceFunctionExit0( WLANWIZARDPAGESSID_SHOWPAGE_EXIT ); return !(mSsid->text().isEmpty()); } @@ -145,11 +152,13 @@ */ int WlanWizardPageSsid::nextId(bool &removeFromStack) const { + OstTraceFunctionEntry0( WLANWIZARDPAGESSID_NEXTID_ENTRY ); removeFromStack = false; // SSID is stored into configuration mWizard->setConfiguration(WlanWizardPrivate::ConfSsid, mSsid->text()); + OstTraceFunctionExit0( WLANWIZARDPAGESSID_NEXTID_EXIT ); return WlanWizardPageInternal::PageScanning; } @@ -161,6 +170,7 @@ */ void WlanWizardPageSsid::loadDocmlSection(Qt::Orientation orientation) { + OstTraceFunctionEntry0( WLANWIZARDPAGESSID_LOADDOCMLSECTION_ENTRY ); OstTrace1( TRACE_FLOW, WLANWIZARDPAGESSID_LOADDOCML, "WlanWizardPageSsid::loadDocml - orientation ;orientation=%x", ( TUint )( orientation ) ); @@ -171,6 +181,7 @@ ":/docml/occ_add_wlan_01_04.docml", "portrait_section", "landscape_section"); + OstTraceFunctionExit0( WLANWIZARDPAGESSID_LOADDOCMLSECTION_EXIT ); } /*! @@ -180,9 +191,11 @@ */ void WlanWizardPageSsid::textChanged(const QString &text) { + OstTraceFunctionEntry0( WLANWIZARDPAGESSID_TEXTCHANGED_ENTRY ); Q_UNUSED(text); OstTrace0( TRACE_FLOW, WLANWIZARDPAGESSID_TEXTCHANGED, "WlanWizardPageSsid::textChanged in text edit widget" ); mWizard->enableNextButton(!(mSsid->text().isEmpty())); + OstTraceFunctionExit0( WLANWIZARDPAGESSID_TEXTCHANGED_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardpagesummary.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardpagesummary.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardpagesummary.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -30,6 +30,11 @@ #include "wlanwizardplugin.h" #include "wlanwizardsummaryviewitem.h" #include "wlanwizardpagesummary.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "wlanwizardpagesummaryTraces.h" +#endif + /*! \class WlanWizardPageSummary @@ -56,6 +61,8 @@ WlanWizardPageInternal(parent), mListWidget(NULL) { + OstTraceFunctionEntry0( WLANWIZARDPAGESUMMARY_WLANWIZARDPAGESUMMARY_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDPAGESUMMARY_WLANWIZARDPAGESUMMARY_EXIT ); } /*! @@ -63,9 +70,11 @@ */ WlanWizardPageSummary::~WlanWizardPageSummary() { + OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGESUMMARY_WLANWIZARDPAGESUMMARY_ENTRY ); HbStyleLoader::unregisterFilePath(WlanWizardPageSummaryLayout); // Wizard framework deletes the visualization (owns mListWidget). + OstTraceFunctionExit0( DUP1_WLANWIZARDPAGESUMMARY_WLANWIZARDPAGESUMMARY_EXIT ); } /*! @@ -73,6 +82,7 @@ */ HbWidget* WlanWizardPageSummary::initializePage() { + OstTraceFunctionEntry0( WLANWIZARDPAGESUMMARY_INITIALIZEPAGE_ENTRY ); // Note that from summary page it is not possible to step back // this means that it is not possible that this method is called twice. Q_ASSERT(!mListWidget); @@ -93,6 +103,7 @@ addDynamicItems(row); + OstTraceFunctionExit0( WLANWIZARDPAGESUMMARY_INITIALIZEPAGE_EXIT ); return qobject_cast(mListWidget); } @@ -101,6 +112,7 @@ */ void WlanWizardPageSummary::loadDocml() { + OstTraceFunctionEntry0( WLANWIZARDPAGESUMMARY_LOADDOCML_ENTRY ); bool ok; HbDocumentLoader docLoader(mWizard->mainWindow()); @@ -120,6 +132,7 @@ // Register the location of hblistviewitem.css and hblistviewitem.widgetml ok = HbStyleLoader::registerFilePath(WlanWizardPageSummaryLayout); Q_ASSERT(ok); + OstTraceFunctionExit0( WLANWIZARDPAGESUMMARY_LOADDOCML_EXIT ); } /*! @@ -130,6 +143,7 @@ */ QString WlanWizardPageSummary::networkModeText() const { + OstTraceFunctionEntry0( WLANWIZARDPAGESUMMARY_NETWORKMODETEXT_ENTRY ); QString ret; int mode = mWizard->configuration( WlanWizardPrivate::ConfNetworkMode).toInt(); @@ -148,6 +162,7 @@ } break; } + OstTraceFunctionExit0( WLANWIZARDPAGESUMMARY_NETWORKMODETEXT_EXIT ); return ret; } @@ -159,6 +174,7 @@ */ QString WlanWizardPageSummary::securityModeText() const { + OstTraceFunctionEntry0( WLANWIZARDPAGESUMMARY_SECURITYMODETEXT_ENTRY ); QString ret; int mode = mWizard->configuration(WlanWizardPrivate::ConfSecurityMode).toInt(); switch (mode) { @@ -191,6 +207,7 @@ ret = hbTrId("txt_occ_dblist_security_mode_val_open"); break; } + OstTraceFunctionExit0( WLANWIZARDPAGESUMMARY_SECURITYMODETEXT_EXIT ); return ret; } @@ -201,13 +218,13 @@ */ void WlanWizardPageSummary::addDynamicItems(int &row) { + OstTraceFunctionEntry0( WLANWIZARDPAGESUMMARY_ADDDYNAMICITEMS_ENTRY ); if (mWizard->isEapEnabled()) { appendToListPluginInfo(WlanWizardPlugin::SummaryEapOuterType, row); appendToListPluginInfo(WlanWizardPlugin::SummaryEapInnerType, row); appendToListPluginInfo(WlanWizardPlugin::SummaryEapFastProvisioningMode, row); } - // TODO: Hotspot: no need to show destination.. QString value; switch (mWizard->configuration(WlanWizardPrivate::ConfIctStatus).toInt()) { @@ -222,10 +239,12 @@ break; default: - Q_ASSERT(WlanQtUtils::IctHotspotPassed == mWizard->configuration(WlanWizardPrivate::ConfIctStatus).toInt()); + Q_ASSERT(WlanQtUtils::IctHotspotPassed == + mWizard->configuration(WlanWizardPrivate::ConfIctStatus).toInt()); // Add nothing to list. break; } + OstTraceFunctionExit0( WLANWIZARDPAGESUMMARY_ADDDYNAMICITEMS_EXIT ); } /*! @@ -240,10 +259,12 @@ const QString title, const QString value) { + OstTraceFunctionEntry0( WLANWIZARDPAGESUMMARY_APPENDTOLIST_ENTRY ); HbListWidgetItem *item = new HbListWidgetItem(); item->setText(title); item->setSecondaryText(value); mListWidget->insertItem(row++, item); + OstTraceFunctionExit0( WLANWIZARDPAGESUMMARY_APPENDTOLIST_EXIT ); } /*! @@ -255,6 +276,7 @@ void WlanWizardPageSummary::appendToListPluginInfo( WlanWizardPlugin::Summary id, int &row ) { + OstTraceFunctionEntry0( WLANWIZARDPAGESUMMARY_APPENDTOLISTPLUGININFO_ENTRY ); QString title; QString value; WlanWizardPlugin *plugin = mWizard->wlanWizardPlugin(); @@ -262,4 +284,5 @@ if (plugin->summary(id, title, value)) { appendToList(row, title, value ); } + OstTraceFunctionExit0( WLANWIZARDPAGESUMMARY_APPENDTOLISTPLUGININFO_EXIT ); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardscanlist.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardscanlist.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardscanlist.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -26,13 +26,20 @@ // User includes #include "wlanwizardscanlist.h" #include "wlanwizardpageinternal.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "wlanwizardscanlistTraces.h" +#endif + /*! * Constructor for WlanWizardScanList object. */ -WlanWizardScanList::WlanWizardScanList() +WlanWizardScanList::WlanWizardScanList(): mWpsSelected(false) { + OstTraceFunctionEntry0( WLANWIZARDSCANLIST_WLANWIZARDSCANLIST_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDSCANLIST_WLANWIZARDSCANLIST_EXIT ); } /*! @@ -40,9 +47,11 @@ * @param [in] scanList is the object to be copied. */ WlanWizardScanList::WlanWizardScanList(const WlanWizardScanList &scanList): - mOpenOptions(scanList.mOpenOptions) +mOpenOptions(scanList.mOpenOptions), mWpsSelected(false) { + OstTraceFunctionEntry0( DUP1_WLANWIZARDSCANLIST_WLANWIZARDSCANLIST_ENTRY ); + OstTraceFunctionExit0( DUP1_WLANWIZARDSCANLIST_WLANWIZARDSCANLIST_EXIT ); } /*! @@ -50,7 +59,9 @@ */ WlanWizardScanList::~WlanWizardScanList() { + OstTraceFunctionEntry0( DUP2_WLANWIZARDSCANLIST_WLANWIZARDSCANLIST_ENTRY ); + OstTraceFunctionExit0( DUP2_WLANWIZARDSCANLIST_WLANWIZARDSCANLIST_EXIT ); } /*! @@ -62,15 +73,19 @@ */ void WlanWizardScanList::build(const QList &results) { + OstTraceFunctionEntry0( WLANWIZARDSCANLIST_BUILD_ENTRY ); + + mWpsSelected = true; + for (int i = 0; i < results.size(); i++) { WlanNetworkSetting netMode; WlanSecuritySetting secMode; WlanScanResult item = results.at(i); - + netMode.wpsSupported = item.scanResult->value(WlanQtUtilsAp::ConfIdWpsSupported).toBool(); netMode.mode = item.scanResult->value(WlanQtUtilsAp::ConfIdConnectionMode).toInt(); netMode.hidden = (netMode.mode == CMManagerShim::Adhoc) ? false : item.networkHidden; - + secMode.mode = item.scanResult->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt(); secMode.usePsk = (secMode.mode == CMManagerShim::WlanSecModeWep) ? true : item.scanResult->value(WlanQtUtilsAp::ConfIdWpaPskUse).toBool(); @@ -79,11 +94,11 @@ case CMManagerShim::WlanSecMode802_1x: secMode.nextPageId = WlanWizardPage::PageEapStart; break; - + case CMManagerShim::WlanSecModeWep: secMode.nextPageId = WlanWizardPageInternal::PageKeyQuery; break; - + case CMManagerShim::WlanSecModeWpa: case CMManagerShim::WlanSecModeWpa2: if (secMode.usePsk) { @@ -99,11 +114,12 @@ CMManagerShim::WlanSecModeWapi == secMode.mode); secMode.nextPageId = WlanWizardPage::PageProcessSettings; break; - + } - + // prevent duplicate settings. if (!mOpenOptions.contains(netMode)) { + mWpsSelected = (mWpsSelected && netMode.wpsSupported); QList secList; secList.append(secMode); mOpenOptions.insert(netMode, secList); @@ -113,6 +129,7 @@ } // else an identical key-value pair is already in the list -> not added. } + OstTraceFunctionExit0( WLANWIZARDSCANLIST_BUILD_EXIT ); } /*! @@ -127,6 +144,7 @@ WlanNetworkSetting netMode, int index) const { + OstTraceFunctionEntry0( WLANWIZARDSCANLIST_GETSECMODE_ENTRY ); return mOpenOptions.value(netMode).at(index); } @@ -136,6 +154,7 @@ */ int WlanWizardScanList::netModes() const { + OstTraceFunctionEntry0( WLANWIZARDSCANLIST_NETMODES_ENTRY ); return mOpenOptions.size(); } @@ -146,6 +165,8 @@ */ int WlanWizardScanList::secModes(WlanNetworkSetting netMode) const { + OstTraceFunctionEntry0( WLANWIZARDSCANLIST_SECMODES_ENTRY ); + Q_ASSERT(mOpenOptions.contains(netMode)); return mOpenOptions.find(netMode)->size(); } @@ -155,6 +176,18 @@ */ QList WlanWizardScanList::getNetModes() const { + OstTraceFunctionEntry0( WLANWIZARDSCANLIST_GETNETMODES_ENTRY ); return mOpenOptions.keys(); } +/*! + * This function indicates whether the list of scan results supports + * Wi-Fi Protected Setup. + * @return true, if all result network modes support wps, false if even + * a single result does not. + */ +bool WlanWizardScanList::wpsSelected() const +{ + OstTraceFunctionEntry0( WLANWIZARDSCANLIST_WPSSELECTED_ENTRY ); + return mWpsSelected; +} diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardsummaryviewitem.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardsummaryviewitem.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardsummaryviewitem.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -21,13 +21,18 @@ // User includes #include "wlanwizardsummaryviewitem.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "wlanwizardsummaryviewitemTraces.h" +#endif + /*! \class WlanWizardSummaryListViewItem \brief Implements custom List view for Summary page. - + HbListWidget does not support directly views where selection is disabled. - + This implementation removes required operations to disable list selection. */ @@ -41,13 +46,17 @@ /*! Constructor. - + @param [in] parent parent class */ WlanWizardSummaryListViewItem::WlanWizardSummaryListViewItem( QGraphicsItem* parent) : HbListViewItem(parent) { + OstTraceFunctionEntry0( + WLANWIZARDSUMMARYLISTVIEWITEM_WLANWIZARDSUMMARYLISTVIEWITEM_ENTRY ); + OstTraceFunctionExit0( + WLANWIZARDSUMMARYLISTVIEWITEM_WLANWIZARDSUMMARYLISTVIEWITEM_EXIT ); } /*! @@ -55,22 +64,28 @@ */ WlanWizardSummaryListViewItem::~WlanWizardSummaryListViewItem() { + OstTraceFunctionEntry0( + DUP1_WLANWIZARDSUMMARYLISTVIEWITEM_WLANWIZARDSUMMARYLISTVIEWITEM_ENTRY ); + OstTraceFunctionExit0( + DUP1_WLANWIZARDSUMMARYLISTVIEWITEM_WLANWIZARDSUMMARYLISTVIEWITEM_EXIT ); } /*! See HbListViewItem::updateChildItems(). - + Disables selection. */ void WlanWizardSummaryListViewItem::updateChildItems() { + OstTraceFunctionEntry0( WLANWIZARDSUMMARYLISTVIEWITEM_UPDATECHILDITEMS_ENTRY ); HbListViewItem::updateChildItems(); - + ungrabGesture(Qt::TapGesture); - + GraphicsItemFlags itemFlags = flags(); itemFlags &= ~QGraphicsItem::ItemIsFocusable; setFlags(itemFlags); + OstTraceFunctionExit0( WLANWIZARDSUMMARYLISTVIEWITEM_UPDATECHILDITEMS_EXIT ); } /*! @@ -78,5 +93,7 @@ */ HbAbstractViewItem* WlanWizardSummaryListViewItem::createItem() { + OstTraceFunctionEntry0( WLANWIZARDSUMMARYLISTVIEWITEM_CREATEITEM_ENTRY ); + OstTraceFunctionExit0( WLANWIZARDSUMMARYLISTVIEWITEM_CREATEITEM_EXIT ); return new WlanWizardSummaryListViewItem(*this); } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/src/wlanwizardutils.cpp --- a/wlanutilities/wlanwizard/src/wlanwizardutils.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/src/wlanwizardutils.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -108,6 +108,7 @@ */ WlanWizardUtils::KeyStatus WlanWizardUtils::validateWpaKey(const QString &key) { + OstTraceFunctionEntry0( WLANWIZARDUTILS_VALIDATEWPAKEY_ENTRY ); #ifdef OST_TRACE_COMPILER_IN_USE TPtrC tmp(key.utf16(),key.length() ); OstTraceExt1( TRACE_NORMAL, WLANWIZARDUTILS_VALIDATEWPAKEY, @@ -131,6 +132,7 @@ TRACE_NORMAL, WLANWIZARDUTILS_VALIDATEWPAKEY_RETURN, "WlanWizardUtils::validateWpaKey - Return;ret=%{KeyStatus}", ret ); + OstTraceFunctionExit0( WLANWIZARDUTILS_VALIDATEWPAKEY_EXIT ); return ret; } @@ -154,6 +156,7 @@ */ WlanWizardUtils::KeyStatus WlanWizardUtils::validateWepKey(const QString &key) { + OstTraceFunctionEntry0( WLANWIZARDUTILS_VALIDATEWEPKEY_ENTRY ); #ifdef OST_TRACE_COMPILER_IN_USE TPtrC tmp(key.utf16(),key.length() ); OstTraceExt1( TRACE_NORMAL, WLANWIZARDUTILS_VALIDATEWEPKEY, @@ -175,6 +178,7 @@ TRACE_NORMAL, WLANWIZARDUTILS_VALIDATEWEPKEY_RETURN, "WlanWizardUtils::validateWepKey - Return;ret=%{KeyStatus}", ret ); + OstTraceFunctionExit0( WLANWIZARDUTILS_VALIDATEWEPKEY_EXIT ); return ret; } @@ -189,16 +193,19 @@ */ WlanWizardUtils::KeyStatus WlanWizardUtils::isAscii(const QString &key) { + OstTraceFunctionEntry0( WLANWIZARDUTILS_ISASCII_ENTRY ); static const QChar ch32(32); // First visible ascii character static const QChar ch126(126); // Last visible ascii character const QChar *data = key.data(); while (!data->isNull()) { if ((*data) < ch32 || (*data) > ch126) { + OstTraceFunctionExit0( WLANWIZARDUTILS_ISASCII_EXIT ); return KeyStatusIllegalCharacters; } ++data; } + OstTraceFunctionExit0( DUP1_WLANWIZARDUTILS_ISASCII_EXIT ); return KeyStatusOk; } @@ -216,6 +223,7 @@ */ WlanWizardUtils::KeyStatus WlanWizardUtils::isHex(const QString &key) { + OstTraceFunctionEntry0( WLANWIZARDUTILS_ISHEX_ENTRY ); static const QChar ch_A(65); // Character: A static const QChar ch_F(70); // Character: F static const QChar ch_a(97); // Character: a @@ -228,9 +236,11 @@ (*data) >= ch_A && (*data) <= ch_F) { ++data; } else { + OstTraceFunctionExit0( WLANWIZARDUTILS_ISHEX_EXIT ); return KeyStatusIllegalCharacters; } } + OstTraceFunctionExit0( DUP1_WLANWIZARDUTILS_ISHEX_EXIT ); return KeyStatusOk; } @@ -245,6 +255,7 @@ */ WlanWizardUtils::SsidStatus WlanWizardUtils::validateSsid(const QString &ssid) { + OstTraceFunctionEntry0( WLANWIZARDUTILS_VALIDATESSID_ENTRY ); TPtrC tmp(ssid.utf16(), ssid.length() ); OstTraceExt1( TRACE_NORMAL, WLANWIZARDUTILS_VALIDATESSID, "WlanWizardUtils::validateSsid;ssid=%S", tmp ); @@ -258,5 +269,6 @@ OstTrace1( TRACE_NORMAL, WLANWIZARDUTILS_VALIDATESSID_RETURN, "WlanWizardUtils::validateSsid - Return;ret=%{SsidStatus}", ret ); + OstTraceFunctionExit0( WLANWIZARDUTILS_VALIDATESSID_EXIT ); return ret; } diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/t_wlanwizard/stubs/wlanqtutilsap.h --- a/wlanutilities/wlanwizard/t_wlanwizard/stubs/wlanqtutilsap.h Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/t_wlanwizard/stubs/wlanqtutilsap.h Wed Aug 18 10:52:46 2010 +0300 @@ -114,7 +114,7 @@ void setValue(int identifier, QVariant value ); bool operator==(const WlanQtUtilsAp & rhs ) const; - static bool compare( + static int compare( const WlanQtUtilsAp *ap1, const WlanQtUtilsAp *ap2); diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/t_wlanwizard/stubs/wlanqtutilsap_stub.cpp --- a/wlanutilities/wlanwizard/t_wlanwizard/stubs/wlanqtutilsap_stub.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/t_wlanwizard/stubs/wlanqtutilsap_stub.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -91,14 +91,14 @@ @param [in] ap1 First AP to compare. @param [in] ap2 Second AP to compare. - @return TRUE, if APs are considered to be same. + @return Zero(0), if APs are considered to be same. */ -bool WlanQtUtilsAp::compare( +int WlanQtUtilsAp::compare( const WlanQtUtilsAp *ap1, const WlanQtUtilsAp *ap2) { - bool equal = false; + int equal = 1; // Not equal // SSID (case sensitive) and security mode (with or without PSK) // are the values, which identify a unique access point. @@ -108,7 +108,7 @@ ap2->value(WlanQtUtilsAp::ConfIdSecurityMode) && ap1->value(WlanQtUtilsAp::ConfIdWpaPskUse) == ap2->value(WlanQtUtilsAp::ConfIdWpaPskUse)) { - equal = true; + equal = 0; // Equal } return equal; diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardcontext.cpp --- a/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardcontext.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardcontext.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -326,23 +326,23 @@ return verifyDialogText("dialog", info); case WlanWizardPageInternal::PageKeyQuery: - return verifyDialogText("dialog", HbParameterLengthLimiter(hbTrId("txt_occ_dialog_enter_key_for_1")).arg(info)); + return verifyDialogText("dialog", HbParameterLengthLimiter("txt_occ_dialog_enter_key_for_1").arg(info)); case WlanWizardPageInternal::PageProcessSettings: - return verifyDialogText("dialog", HbParameterLengthLimiter(hbTrId("txt_occ_dialog_checking_connection_to_1")).arg(info)); + return verifyDialogText("dialog", HbParameterLengthLimiter("txt_occ_dialog_checking_connection_to_1").arg(info)); case WlanWizardPageInternal::PageScanning: - return verifyDialogText("dialog", HbParameterLengthLimiter(hbTrId("txt_occ_dialog_searching")).arg(info)); + return verifyDialogText("dialog", HbParameterLengthLimiter("txt_occ_dialog_searching").arg(info)); case EapWizardPage::PageUsernamePassword: ret &= verifyDialogText( "setlabel_55", - HbParameterLengthLimiter(hbTrId("txt_occ_setlabel_user_name_for_1")).arg(info)); + HbParameterLengthLimiter("txt_occ_setlabel_user_name_for_1").arg(info)); ret &= verifyDialogText("setlabel_56", hbTrId("txt_occ_setlabel_eap_password")); return ret; case EapWizardPage::PageIdentity: - ret &= verifyDialogText("setlabel_53", HbParameterLengthLimiter(hbTrId("txt_occ_setlabel_user_name_for_1")).arg(info)); + ret &= verifyDialogText("setlabel_53", HbParameterLengthLimiter("txt_occ_setlabel_user_name_for_1").arg(info)); ret &= verifyDialogText("setlabel_53_val", hbTrId("txt_occ_setlabel_user_name_val_generate_automatic")); ret &= verifyDialogText("setlabel_54", hbTrId("txt_occ_setlabel_eap_realm")); ret &= verifyDialogText("setlabel_54_val", hbTrId("txt_occ_setlabel_eap_realm_val_generate_automatically")); @@ -350,7 +350,7 @@ case EapWizardPage::PageInnerTypePeap: case EapWizardPage::PageInnerTypeEapTtls: - return verifyDialogText("title", HbParameterLengthLimiter(hbTrId("txt_occ_title_select_innear_eap_type_for_1")).arg(info)); + return verifyDialogText("title", HbParameterLengthLimiter("txt_occ_title_select_innear_eap_type_for_1").arg(info)); default: return verifyCurrentPage(pageId, retries, wait_ms); diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual.cpp --- a/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual.cpp Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual.cpp Wed Aug 18 10:52:46 2010 +0300 @@ -992,6 +992,11 @@ QCOMPARE( mouseClickNext(), true ); QCOMPARE( verifyCurrentPage(WlanWizardPageInternal::PageNetworkMode), true ); + QStringList buttons; + buttons << hbTrId("txt_occ_list_infrastructure_hidden") + << hbTrId("txt_occ_list_adhoc_1"); + QCOMPARE( verifyRadioButtons("list"), buttons ); + QTest::qWait(WaitTimeForUi); QCOMPARE( selectRadioButton( "list", 1 ), true ); QTest::qWait(WaitTimeForUi); @@ -1102,6 +1107,11 @@ QCOMPARE( mouseClickNext(), true ); QCOMPARE( verifyCurrentPage(WlanWizardPageInternal::PageNetworkMode), true ); + QStringList buttons; + buttons << hbTrId("txt_occ_dblist_val_infrastructure_public") + << hbTrId("txt_occ_list_infrastructure_hidden") + << hbTrId("txt_occ_list_adhoc_1"); + QCOMPARE( verifyRadioButtons("list"), buttons ); QTest::qWait(WaitTimeForUi); QCOMPARE( selectRadioButton( "list", 0 ), true ); QTest::qWait(WaitTimeForUi); @@ -1168,3 +1178,80 @@ QCOMPARE( verifyCurrentPageWithInfo(WlanWizardPageInternal::PageKeyQuery, "huuhaa3421"), true ); #endif } + +/*! + * + */ +void TestWlanWizardManual::tc_multiple_ssids_with_same_name_wps_and_nonwps() +{ +#ifdef tc_multiple_ssids_with_same_name_wps_and_nonwps_enabled + mApList->Add("huuhaa", CMManagerShim::Infra, CMManagerShim::WlanSecModeWpa, false, false, 100); + + // Add all five kinds of security modes. + mApList->Add("huuhaa", CMManagerShim::Infra, CMManagerShim::WlanSecModeWep, true, true, 300); + + mWlanQtUtilsContext->setScanWlanDirectResult("huuhaa", mApList->List()); + mWlanQtUtilsContext->setCreateWlanIapResult(100); + mWlanQtUtilsContext->setSignalIctResult(100, WlanQtUtils::IctPassed); + mWlanQtUtilsContext->setSignalWlanNetworkOpened(100); + mWlanQtUtilsContext->setConnectionSuccessed(true); + + mView->showWizard(); + + QCOMPARE( verifyCurrentPage(WlanWizardPageInternal::PageSsid), true ); + + QCOMPARE( mouseClickObject("lineEditKey"), true ); + QTest::qWait(WaitTimeForUi); + QCOMPARE( insertTextToObject("lineEditKey", "huuhaa"), true ); + QTest::qWait(WaitTimeForUi); + QCOMPARE( mouseClickObject("dialog"), true ); + QTest::qWait(WaitTimeForUi); + QCOMPARE( mouseClickNext(), true ); + + QCOMPARE( verifyCurrentPageWithInfo(WlanWizardPageInternal::PageScanning, "huuhaa"), true ); + QCOMPARE( verifyCurrentPage(WlanWizardPageInternal::PageNetworkMode), true ); + QStringList buttons; + buttons << hbTrId("txt_occ_list_infrastructure_hidden") + << hbTrId("txt_occ_list_wifi_protected_setup"); + QCOMPARE( verifyRadioButtons("list"), buttons ); + QCOMPARE( selectRadioButton( "list", 1 ), true ); + QTest::qWait(WaitTimeForUi); + QCOMPARE( mouseClickNext(), true ); + + QCOMPARE( verifyCurrentPage(WlanWizardPageInternal::PageWpsStart), true ); +#endif +} + +/*! + * + */ +void TestWlanWizardManual::tc_multiple_ssids_with_same_name_two_wps_aps() +{ +#ifdef tc_multiple_ssids_with_same_name_two_wps_aps_enabled + mApList->Add("huuhaa", CMManagerShim::Infra, CMManagerShim::WlanSecModeWpa, false, true, 100); + + // Add all five kinds of security modes. + mApList->Add("huuhaa", CMManagerShim::Infra, CMManagerShim::WlanSecModeWep, true, true, 300); + + mWlanQtUtilsContext->setScanWlanDirectResult("huuhaa", mApList->List()); + mWlanQtUtilsContext->setCreateWlanIapResult(100); + mWlanQtUtilsContext->setSignalIctResult(100, WlanQtUtils::IctPassed); + mWlanQtUtilsContext->setSignalWlanNetworkOpened(100); + mWlanQtUtilsContext->setConnectionSuccessed(true); + + mView->showWizard(); + + QCOMPARE( verifyCurrentPage(WlanWizardPageInternal::PageSsid), true ); + + QCOMPARE( mouseClickObject("lineEditKey"), true ); + QTest::qWait(WaitTimeForUi); + QCOMPARE( insertTextToObject("lineEditKey", "huuhaa"), true ); + QTest::qWait(WaitTimeForUi); + QCOMPARE( mouseClickObject("dialog"), true ); + QTest::qWait(WaitTimeForUi); + QCOMPARE( mouseClickNext(), true ); + + QCOMPARE( verifyCurrentPageWithInfo(WlanWizardPageInternal::PageScanning, "huuhaa"), true ); + QCOMPARE( verifyCurrentPage(WlanWizardPageInternal::PageWpsStart), true ); +#endif +} diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual.h --- a/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual.h Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual.h Wed Aug 18 10:52:46 2010 +0300 @@ -54,6 +54,8 @@ void tc_multiple_ssids_with_same_name_press_previous(); void tc_multiple_ssids_with_same_name_all_sec_modes(); void tc_multiple_ssids_with_same_name_orientation_switch(); + void tc_multiple_ssids_with_same_name_wps_and_nonwps(); + void tc_multiple_ssids_with_same_name_two_wps_aps(); }; diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual_conf.h --- a/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual_conf.h Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/t_wlanwizard/ut/testwlanwizardmanual_conf.h Wed Aug 18 10:52:46 2010 +0300 @@ -49,3 +49,5 @@ #define tc_multiple_ssids_with_same_name_press_previous_enabled #define tc_multiple_ssids_with_same_name_all_sec_modes_enabled #define tc_multiple_ssids_with_same_name_orientation_switch_enabled +#define tc_multiple_ssids_with_same_name_wps_and_nonwps_enabled +#define tc_multiple_ssids_with_same_name_two_wps_aps_enabled diff -r 2fbd1d709fe7 -r d4198dcb9983 wlanutilities/wlanwizard/wlanwizard.pro --- a/wlanutilities/wlanwizard/wlanwizard.pro Tue Jul 06 15:29:22 2010 +0300 +++ b/wlanutilities/wlanwizard/wlanwizard.pro Wed Aug 18 10:52:46 2010 +0300 @@ -73,7 +73,7 @@ symbian { INCLUDEPATH += \ inc \ - ..\inc + ../inc TARGET.UID3 = 0x2002C39A TARGET.CAPABILITY = CAP_GENERAL_DLL