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