diff -r 7b3e49e4608a -r 72ebcbb64834 wlanutilities/eapwizard/src/eapwizardpagecertuser.cpp --- a/wlanutilities/eapwizard/src/eapwizardpagecertuser.cpp Thu Jun 24 10:49:51 2010 +0300 +++ b/wlanutilities/eapwizard/src/eapwizardpagecertuser.cpp Fri Jul 09 10:38:19 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 ); }