--- a/wlanutilities/wpswizard/src/wpswizard.cpp	Thu Jun 10 15:44:54 2010 +0300
+++ b/wlanutilities/wpswizard/src/wpswizard.cpp	Thu Jun 24 10:49:51 2010 +0300
@@ -2,7 +2,7 @@
  * 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 the License "Eclipse Public License v1.0"
+ * under the terms of the "Eclipse Public License v1.0"
  * which accompanies this distribution, and is available
  * at the URL "http://www.eclipse.org/legal/epl-v10.html".
  *
@@ -16,28 +16,14 @@
  *
  */
 
-
 // System includes
-#include <hbdocumentloader.h>
-#include <qgraphicswidget>
-#include <hbmainwindow.h>
-#include <hbview.h>
-#include <hbstackedwidget.h>
-#include <hblabel.h>
-#include <hbaction.h>
-#include <qapplication.h>
-
-// Trace includes
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "wpswizardTraces.h"
-#endif
+#include <QApplication>
 
 // User includes
 // WLAN Wizard
-#include "wlanwizardhelpper.h"
+#include "wlanwizardhelper.h"
 
-// Wizard 
+// WPS Wizard 
 #include "wpswizard.h"
 #include "wpswizard_p.h"
 
@@ -48,62 +34,49 @@
 #include "wpswizardstepfour.h"
 #include "wpswizardstepfive.h"
 
+// Trace includes
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "wpswizardTraces.h"
+#endif
 
-class WlanWizardHelpper;
+//Forward Declarations
+class WlanWizardHelper;
+
+// External function prototypes
+
+//Local Constants
 
 /*!
-* Creates the WpsWizard object
-* 
-* \param WlanWizardHelpper* Helper class to from the framework
-* \param BearerType Indicates the bearer type Eg. Wlan
-* 
-*/
+    \class WpsWizard
+    \brief Provides the WPS wizard implementation 
+ */
 
-WpsWizard::WpsWizard(WlanWizardHelpper *wizardHelpper, BearerType bearerType,
-        int referenceId) :
-    d_ptr(new WpsWizardPrivate(this, wizardHelpper, bearerType, referenceId))
-    {
-    OstTraceFunctionEntry1(WPSWIZARD_WPSWIZARD_ENTRY, this)
-    OstTraceFunctionExit1(WPSWIZARD_WPSWIZARD_EXIT, this)
-    }
+// ======== LOCAL FUNCTIONS ========
+
+// ======== MEMBER FUNCTIONS ========
 
 /*!
-* Destructor
-* 
-*/
+   Creates the WpsWizard object
+   
+   @param [in] wizardHelper WlanWizardHelper* Helper class to from the framework
+ */
 
-WpsWizard::~WpsWizard()
-    {
-    OstTraceFunctionEntry1(WPSWIZARD_WPSWIZARD_ENTRY, this);
-    delete d_ptr;
+WpsWizard::WpsWizard(WlanWizardHelper *wizardHelper) :
+    d_ptr(NULL)
+{
+    OstTraceFunctionEntry1(WPSWIZARD_WPSWIZARD_ENTRY, this); 
+    d_ptr.reset(new WpsWizardPrivate(this, wizardHelper));
     OstTraceFunctionExit1(WPSWIZARD_WPSWIZARD_EXIT, this);
-    }
+}
 
 /*!
-* StoreSettings: Stores the settings in the commsdat database
-* 
-*/
-
-void WpsWizard::storeSettings()
-    {
-    OstTraceFunctionEntry1(WPSWIZARD_STORESETTINGS_ENTRY, this);
-    OstTraceFunctionExit1(WPSWIZARD_STORESETTINGS_EXIT, this);
-    }
+   Destructor
+   
+ */
+WpsWizard::~WpsWizard()
+{
+    OstTraceFunctionEntry1(WPSWIZARD_WPSWIZARD_DESTRUCTOR_ENTRY, this);
+    OstTraceFunctionExit1(WPSWIZARD_WPSWIZARD_DESTRUCTOR_EXIT, this);
+}
 
-/*!
-* Creates the summary page, valid only for EAP usecase
-* 
-* \param WlanWizardPlugin::Summary indicates the type of summary item
-* \param QString &item item name
-* \param QString &value item value
-* 
-* \return the status of the summary operation
-*/
-
-bool WpsWizard::summary(WlanWizardPlugin::Summary sum, QString &item,
-        QString &value)
-    {
-    OstTraceFunctionEntry1(WPSWIZARD_SUMMARY_ENTRY, this);
-    OstTraceFunctionExit1(WPSWIZARD_SUMMARY_EXIT, this);
-    return true;
-    }