--- a/securitysettings/qtconfigutils/eapqtconfiginterface/src/eapqtconfiginterface.cpp	Fri Jun 11 16:24:23 2010 +0100
+++ b/securitysettings/qtconfigutils/eapqtconfiginterface/src/eapqtconfiginterface.cpp	Thu Jul 22 16:34:37 2010 +0100
@@ -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,38 +17,138 @@
  */
 
 /*
- * %version: 1 %
+ * %version: 25 %
  */
 
+// System includes
 #include <QList>
+#include <eapqtconfiginterface.h>
+#include <eapqtexpandedeaptype.h>
 
-#include "eapqtconfiginterface.h"
+// User includes
+#include "eapqtconfiginterface_p.h"
 #include "cpeapplugininterface.h"
-#include "eapqtplugininfo.h"
+
+/*!
+ *  \class EapQtConfigInterface
+ *  \brief Public implementation of EAP QT configuration interface
+ */
 
-//----------------------------------------------------------------------------
-//              EapQtConfigInterface
-//----------------------------------------------------------------------------
+// External function prototypes
+
+// Local constants
+
+// ======== LOCAL FUNCTIONS ========
+
+// ======== MEMBER FUNCTIONS ========
 
-// stub implementation for now
+EapQtConfigInterface::EapQtConfigInterface() :
+    d_ptr(new EapQtConfigInterfacePrivate)
+{
+}
 
-EapQtConfigInterface::EapQtConfigInterface(const EapBearerType /* bearerType */, const int /* databaseIndex */)
+EapQtConfigInterface::EapQtConfigInterface(const EapBearerType bearerType, const int iapId) :
+    d_ptr(new EapQtConfigInterfacePrivate(bearerType, iapId))
 {
 }
 
 EapQtConfigInterface::~EapQtConfigInterface()
 {
+    // d_ptr is scoped pointer, deleted automatically
+}
+
+bool EapQtConfigInterface::setConfigurationReference(const int iapId) const
+{
+    return d_ptr->setConfigurationReference(iapId);
 }
 
 QList<EapQtPluginInfo> EapQtConfigInterface::supportedOuterTypes() const
 {
-    // stub
-    QList<EapQtPluginInfo> tmp;
-    return tmp;
+    return d_ptr->supportedOuterTypes();
+}
+
+QList<EapQtPluginInfo> EapQtConfigInterface::supportedInnerTypes(const EapQtPluginHandle &outerType) const
+{
+    return d_ptr->supportedInnerTypes(outerType);
+}
+
+bool EapQtConfigInterface::updateCertificates() const
+{
+    return d_ptr->updateCertificates();
+}
+
+QList<EapQtCertificateInfo> EapQtConfigInterface::certificateAuthorityCertificates() const
+{
+    return d_ptr->certificateAuthorityCertificates();
+}
+
+QList<EapQtCertificateInfo> EapQtConfigInterface::userCertificates() const
+{
+    return d_ptr->userCertificates();
+}
+
+CpBaseSettingView *EapQtConfigInterface::uiInstance(const EapQtPluginHandle &outerHandle,
+    const EapQtPluginHandle &pluginHandle) const
+{
+    return d_ptr->uiInstance(outerHandle, pluginHandle);
+}
+
+QList<EapQtPluginHandle> EapQtConfigInterface::selectedOuterTypes() const
+{
+    return d_ptr->selectedOuterTypes();
+}
+
+bool EapQtConfigInterface::isSupportedOuterType(const EapQtPluginHandle &handle) const
+{
+    return d_ptr->isSupportedOuterType(handle);
 }
 
-CpBaseSettingView *EapQtConfigInterface::uiInstance(const EapQtPluginHandle& /* pluginInfo */) const
+bool EapQtConfigInterface::isSupportedInnerType(const EapQtPluginHandle &outerHandle,
+    const EapQtPluginHandle& innerHandle) const
+{
+    return d_ptr->isSupportedInnerType(outerHandle, innerHandle);
+}
+
+bool EapQtConfigInterface::setSelectedOuterTypes(const QList<EapQtPluginHandle> &outerHandles) const
+{
+    return d_ptr->setSelectedOuterTypes(outerHandles);
+}
+
+bool EapQtConfigInterface::readConfiguration(const EapQtPluginHandle &outerHandle,
+    const EapQtPluginHandle &pluginHandle, EapQtConfig &config) const
+{
+    return d_ptr->readConfiguration(outerHandle, pluginHandle, config);
+}
+
+bool EapQtConfigInterface::saveConfiguration(const EapQtPluginHandle &pluginInfo,
+    const EapQtConfig &config) const
+{
+    return d_ptr->saveConfiguration(pluginInfo, config);
+}
+
+bool EapQtConfigInterface::deleteConfiguration() const
 {
-    // stub
-    return NULL;
+    return d_ptr->deleteConfiguration();
+}
+
+EapQtValidator *EapQtConfigInterface::validatorEap(const EapQtExpandedEapType &type,
+    const EapQtConfig::SettingsId id) const
+{
+    return d_ptr->validatorEap(type, id);
 }
+
+bool EapQtConfigInterface::readPacStoreConfiguration(EapQtPacStoreConfig &config) const
+{
+    return d_ptr->readPacStoreConfiguration(config);
+}
+
+bool EapQtConfigInterface::savePacStoreConfiguration(const EapQtPacStoreConfig &config) const
+{
+    return d_ptr->savePacStoreConfiguration(config);
+}
+
+EapQtValidator *EapQtConfigInterface::validatorPacStore(
+    const EapQtPacStoreConfig::PacStoreSettings id) const
+{
+    return d_ptr->validatorPacStore(id);
+}