--- a/wlanutilities/wpswizard/src/wpswizardpage.cpp	Thu Jun 10 15:44:54 2010 +0300
+++ b/wlanutilities/wpswizard/src/wpswizardpage.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 "Eclipse Public License v1.0"
  * which accompanies this distribution, and is available
  * at the URL "http://www.eclipse.org/legal/epl-v10.html".
  *
@@ -17,9 +17,10 @@
  */
 
 // System includes
-#include <hbwidget.h>
+#include <HbWidget>
 
 // User includes
+#include "wpswizard_p.h"
 #include "wpswizardpage.h"
 
 // Trace includes
@@ -28,48 +29,41 @@
 #include "wpswizardpageTraces.h"
 #endif
 
-#define WPS_DEFAULT_STEPBACK 1
+// External function prototypes
+
+// Local constants
+
+/*!
+   \class WpsWizardPage
+   \brief Implementation of the basic wps wizard page functionality 
+ */
+
+// ======== LOCAL FUNCTIONS ========
 
- /*!
- * Constructor for the WPS page baseclass
- * 
- * \param WpsWizardPrivate* pointer to the implementation class
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+   Constructor for the WPS page baseclass
+   
+   @param [in] parent WpsWizardPrivate* pointer to the implementation class
  */
- 
+
 WpsWizardPage::WpsWizardPage(WpsWizardPrivate* parent) :
+    QObject(parent),
     mWizard(parent)
 {
-OstTraceFunctionEntry1(WPSWIZARDPAGE_WPSWIZARDPAGE_ENTRY, this)
-OstTraceFunctionExit1(WPSWIZARDPAGE_WPSWIZARDPAGE_EXIT, this)
+    OstTraceFunctionEntry1(WPSWIZARDPAGE_WPSWIZARDPAGE_ENTRY, this); 
+    OstTraceFunctionExit1(WPSWIZARDPAGE_WPSWIZARDPAGE_EXIT, this);
 }
 
 /*!
-* Destructor
-*/
+   Destructor
+ */
 WpsWizardPage::~WpsWizardPage()
 {
-    OstTraceFunctionEntry1(WPSWIZARDPAGE_WPSWIZARDPAGE_ENTRY, this)
+    OstTraceFunctionEntry1(WPSWIZARDPAGE_WPSWIZARDPAGE_DESTRUCTOR_ENTRY, this);
     mWizard = NULL;
-OstTraceFunctionExit1(WPSWIZARDPAGE_WPSWIZARDPAGE_EXIT, this)
+    OstTraceFunctionExit1(WPSWIZARDPAGE_WPSWIZARDPAGE_DESTRUCTOR_EXIT, this);
 }
 
-/*!
-* Determines how many pages to step back.
-* \return number of pages to step backwards
-*/
-int WpsWizardPage::stepsBackwards()
-{
-    OstTraceFunctionEntry1(WPSWIZARDPAGE_STEPBACKWARDS_ENTRY, this)
-    OstTraceFunctionExit1(WPSWIZARDPAGE_STEPBACKWARDS_EXIT, this)
-    return WPS_DEFAULT_STEPBACK;
-}
-
-/*!
-* Validates the contents of the page
-*/
-bool WpsWizardPage::validate() const
-{
-    OstTraceFunctionEntry1(WPSWIZARDPAGE_VALIDATE_ENTRY, this)
-    OstTraceFunctionExit1(WPSWIZARDPAGE_VALIDATE_EXIT, this)
-    return true;
-}