diff -r d9ec2b8c6bad -r 2fbd1d709fe7 wlanutilities/wlanwizard/inc/wlanwizardpagessid.h
--- a/wlanutilities/wlanwizard/inc/wlanwizardpagessid.h	Wed Jun 23 19:25:42 2010 +0300
+++ b/wlanutilities/wlanwizard/inc/wlanwizardpagessid.h	Tue Jul 06 15:29:22 2010 +0300
@@ -44,70 +44,29 @@
 class WlanWizardPageSsid: public WlanWizardPageInternal
 {
     Q_OBJECT
-    friend class TestWlanWizardUi;
 public:
-    /*!
-     * Constructor method for the SSID query view object.
-     * @param parent pointer to parent object.
-     */
-    WlanWizardPageSsid(WlanWizardPrivate* parent);
-    
-    /*!
-     * Destructor for the SSID query view object.
-     */
-    ~WlanWizardPageSsid();
-
-    /*!
-     * Page initialization procedures. Inherited from WlanWizardPage.
-     */
-    HbWidget* initializePage();
+    explicit WlanWizardPageSsid(WlanWizardPrivate* parent);
+    virtual ~WlanWizardPageSsid();
     
-    /*!
-     * This method is overrides the default implementation from WlanWizardPage.
-     * It indicates whether the Next-button should be enabled or not.
-     * @return true, if mSsid edit field is not empty.
-     */
+public:
+    HbWidget* initializePage();
     virtual bool showPage();
-
-    /*!
-     * Validates the SSID selection and sets the configuration in
-     * the wlanwizard.
-     * @param removeFromStack output parameter that returns false.
-     * @return WlanWizardPageScanning page id.
-     */
     int nextId(bool &removeFromStack) const;
-   
-public slots:
-    /*!
-     * Loads the document orientation information from occ_add_wlan_01_04.docml
-     * This is called each time phone orientation changes.
-     * @param orientation indicates whether the phone is in portrait or
-     * landscape mode.
-     */
-    void loadDocml(Qt::Orientation orientation);
+
+signals:
     
-    /*!
-     * Executed when changes have been made to the mSsid field.
-     * @param text is not used at this point.
-     */
+public slots: 
+    void loadDocmlSection(Qt::Orientation orientation);
     void textChanged(const QString &text);
     
 protected:
-    /*!
-     * Reimplements QObject function that is invoked on any event. This
-     * function handles only a focus event to mSsid edit field.
-     * @param obj contains the object, where the event originates from.
-     * @param event contains the event id.
-     */
-    bool eventFilter(QObject *obj, QEvent *event);
     
+protected slots:
+
 private:
-    /*!
-     * Converts status identifier to plain-text QString format.
-     * @param status indicates SSID status code.
-     * @return status text.
-     */
-    QString SsidStatusToErrorString(WlanWizardUtils::SsidStatus status) const;
+    Q_DISABLE_COPY(WlanWizardPageSsid)
+    
+private slots:
     
 private:
     /*!
@@ -126,14 +85,12 @@
     HbLineEdit *mSsid;
     
     /*!
-     * Pointer to error label object.
-     */
-    HbLabel *mLabelError;
-    
-    /*!
      * Pointer to the document loader object.
      */
     HbDocumentLoader *mLoader;
+    
+    // Friend classes
+    friend class TestWlanWizardUi;
 };
 
 /*! @} */