--- 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<HbWidget*> (mDocumentLoader->findWidget("occ_eap_wizard_03"));
         Q_ASSERT(mWidget);
 
@@ -105,35 +115,35 @@
 
         mCheckRealm = qobject_cast<HbCheckBox*> (mDocumentLoader->findWidget("setlabel_54_val"));
         Q_ASSERT(mCheckRealm);
-        
+
         mLabelUsername = qobject_cast<HbLabel*> (mDocumentLoader->findWidget("setlabel_53"));
         Q_ASSERT(mLabelUsername);
-        
+
         mLabelRealm = qobject_cast<HbLabel*> (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;
 }