diff -r 63be7eb3fc78 -r f28ada11abbf wlanutilities/eapwizard/src/eapwizardpagecertca.cpp
--- a/wlanutilities/eapwizard/src/eapwizardpagecertca.cpp	Tue Aug 31 16:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-/*
-* 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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* EAP Wizard Page: Certificate Authority Selection.
-*/
-
-// System includes
-
-#include <HbDocumentLoader>
-#include <HbMainWindow>
-#include <HbWidget>
-#include <HbRadioButtonList>
-#include <HbLabel>
-
-#include <eapqtpluginhandle.h>
-#include <eapqtplugininfo.h>
-#include <eapqtconfiginterface.h>
-#include <eapqtcertificateinfo.h>
-
-// User includes
-
-#include "wlanwizardhelper.h"
-#include "eapwizard_p.h"
-#include "eapwizardpagecertca.h"
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "eapwizardpagecertcaTraces.h"
-#endif
-
-
-/*!
-   \class EapWizardPageCertCa
-   \brief Implements EAP wizard page: Certificate Authority selection
- */
-
-// External function prototypes
-
-// Local constants
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-
-/*!
-   Constructor.
-
-   @param [in] parent Pointer to EAP Wizard private implementation.
- */
-EapWizardPageCertCa::EapWizardPageCertCa(EapWizardPrivate* parent) :
-    EapWizardPage(parent), 
-    mDocumentLoader(NULL), 
-    mWidget(NULL), 
-    mTitle(NULL), 
-    mCertList(NULL)
-{
-    OstTraceFunctionEntry0(EAPWIZARDPAGECERTCA_EAPWIZARDPAGECERTCA_ENTRY);
-    OstTraceFunctionExit0(EAPWIZARDPAGECERTCA_EAPWIZARDPAGECERTCA_EXIT);
-}
-
-/*!
-   Destructor.
- */
-EapWizardPageCertCa::~EapWizardPageCertCa()
-{
-    OstTraceFunctionEntry0(DUP1_EAPWIZARDPAGECERTCA_EAPWIZARDPAGECERTCA_ENTRY);
-    OstTraceFunctionExit0(DUP1_EAPWIZARDPAGECERTCA_EAPWIZARDPAGECERTCA_EXIT);
-}
-
-/*!
-   See WlanWizardPage. 
- */
-HbWidget* EapWizardPageCertCa::initializePage()
-{
-    OstTraceFunctionEntry0(EAPWIZARDPAGECERTCA_INITIALIZEPAGE_ENTRY);
-    
-    if (!mWidget) {
-        mDocumentLoader.reset( new HbDocumentLoader(
-            mWizard->wizardHelper()->mainWindow()) );
-
-        bool ok;
-        mDocumentLoader->load(":/docml/occ_eap_wizard_01_02_04.docml", &ok);
-        Q_ASSERT(ok);
-
-        loadDocmlSection(mWizard->wizardHelper()->mainWindow()->orientation());
-
-        mWidget = qobject_cast<HbWidget*> (
-            mDocumentLoader->findWidget("occ_eap_wizard_01"));
-        Q_ASSERT(mWidget);
-
-        mCertList = qobject_cast<HbRadioButtonList*> (
-            mDocumentLoader->findWidget("list"));
-        Q_ASSERT(mCertList);
-
-        mTitle = qobject_cast<HbLabel*> (mDocumentLoader->findWidget("title"));
-        Q_ASSERT(mTitle);
-
-        mTitle->setPlainText(
-            hbTrId("txt_occ_title_select_authority_certificate"));
-
-        ok = connect(
-            mWizard->wizardHelper()->mainWindow(),
-            SIGNAL(orientationChanged(Qt::Orientation)), 
-            this, 
-            SLOT(loadDocmlSection(Qt::Orientation)));
-        Q_ASSERT(ok);
-    }
-
-    EapQtConfigInterface* confIf = mWizard->eapConfigurationInterface();
-    // ignore return value
-    confIf->updateCertificates();
-    mCerts = confIf->certificateAuthorityCertificates();
-
-    QStringList list;
-    list << hbTrId("txt_occ_setlabel_val_select_automatically");
-    for (int i = 0; i < mCerts.count(); ++i) {
-        list << mCerts.at(i).value(EapQtCertificateInfo::CertificateLabel).toString();
-    }
-
-    // If certificate list has been changed update the content otherwise do not
-    // change it
-    if (list != mCertList->items()) {
-        mCertList->setItems(list);
-        // Automatic is selected by default
-        mCertList->setSelected(IndexForAutomatic);
-    }
-    
-    OstTraceFunctionExit0(EAPWIZARDPAGECERTCA_INITIALIZEPAGE_EXIT);
-    return mWidget;
-}
-
-/*!
-   Loads the required orientation of docml.
-
-   @param [in] orientation Orientation to be loaded. 
- */
-void EapWizardPageCertCa::loadDocmlSection(Qt::Orientation orientation)
-{
-    OstTraceFunctionEntry0(EAPWIZARDPAGECERTCA_LOADDOCMLSECTION_ENTRY);
-    
-    EapWizardPage::loadDocmlSection(
-        mDocumentLoader.data(),
-        orientation,
-        ":/docml/occ_eap_wizard_01_02_04.docml",
-        "portrait_section",
-        "landscape_section");
-    
-    OstTraceFunctionExit0(EAPWIZARDPAGECERTCA_LOADDOCMLSECTION_EXIT);
-}
-
-/*!
-   See WlanWizardPage.
-
-   @return next wizard page:
-   - EapWizardPage::PageCertificateUser: For EAP-TLS 
-   - EapWizardPage::PageIdentity: For EAP-TTLS and PEAP
- */
-int EapWizardPageCertCa::nextId() const
-{
-    OstTraceFunctionEntry0(EAPWIZARDPAGECERTCA_NEXTID_ENTRY);
-    
-    int id = WlanWizardPage::PageNone;
-    bool ok;
-    int type = mWizard->configurations(EapWizardPrivate::OuterType).toInt(&ok);
-    Q_ASSERT(ok);
-
-    if (type == EapQtPluginHandle::PluginEapTls) {
-        id = EapWizardPage::PageCertificateUser;
-    } else {
-        Q_ASSERT(
-            type == EapQtPluginHandle::PluginEapTtls || 
-            type == EapQtPluginHandle::PluginPeap);
-        id = EapWizardPage::PageIdentity;
-    }
-
-    int selected = mCertList->selected();
-    if (selected == IndexForAutomatic) {
-        mWizard->setConfigurations(
-            EapWizardPrivate::CertificateCa,
-            QVariant());
-    } else {
-        mWizard->setConfigurations(
-            EapWizardPrivate::CertificateCa,
-            qVariantFromValue(mCerts.at(selected - AmountOfNonCertItems)));
-    }
-
-    OstTraceFunctionExit0(EAPWIZARDPAGECERTCA_NEXTID_EXIT);
-    return id;
-}