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; }