--- a/boottimeintegritycheck/TrkDummy/group/TrkDummy.mmp	Tue Aug 31 16:04:40 2010 +0300
+++ b/boottimeintegritycheck/TrkDummy/group/TrkDummy.mmp	Wed Sep 01 12:19:59 2010 +0100
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  Dummy exe to prevent installing too liberal TrkApp
-*  Version     : %version: tr1sido#10 %
+*  Version     : %version: tr1sido#9 %
 *
 */
 
@@ -26,9 +26,9 @@
 // This component is built-in'.
 
 
-
-#include <platform_paths.hrh>
-
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+  #include <platform_paths.hrh>
+#endif
 
 CAPABILITY      None
 
@@ -45,9 +45,13 @@
 SOURCE          TrkDummy.cpp
 SOURCE          TrkDummyApplication.cpp
 
-USERINCLUDE     ../inc
+USERINCLUDE     ../inc 
+#if defined (__SERIES60_30__) || defined(__SERIES60_31__)
+	SYSTEMINCLUDE	/epoc32/include  
+#else
+    MW_LAYER_SYSTEMINCLUDE    
+#endif
 
-MW_LAYER_SYSTEMINCLUDE    
 
 LIBRARY         euser.lib
 LIBRARY         apparc.lib

--- a/boottimeintegritycheck/TrkDummy/group/TrkDummy1.mmp	Tue Aug 31 16:04:40 2010 +0300
+++ b/boottimeintegritycheck/TrkDummy/group/TrkDummy1.mmp	Wed Sep 01 12:19:59 2010 +0100
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  Dummy exe to prevent installing too liberal TrkApp
-*  Version     : %version: 8 %
+*  Version     : %version: 7 %
 *
 */
 
@@ -26,9 +26,9 @@
 // This component is built-in'.
 
 
-
-#include <platform_paths.hrh>
-
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+  #include <platform_paths.hrh>
+#endif
 
 CAPABILITY      None
 
@@ -45,9 +45,12 @@
 SOURCE          TrkDummy.cpp
 SOURCE          TrkDummyApplication.cpp
 
-USERINCLUDE     ../inc
-
-MW_LAYER_SYSTEMINCLUDE    
+USERINCLUDE     ../inc 
+#if defined (__SERIES60_30__) || defined(__SERIES60_31__)
+	SYSTEMINCLUDE	/epoc32/include  
+#else
+    MW_LAYER_SYSTEMINCLUDE    
+#endif
 
 LIBRARY         euser.lib
 LIBRARY         apparc.lib

--- a/boottimeintegritycheck/TrkDummy/group/TrkDummy2.mmp	Tue Aug 31 16:04:40 2010 +0300
+++ b/boottimeintegritycheck/TrkDummy/group/TrkDummy2.mmp	Wed Sep 01 12:19:59 2010 +0100
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  Dummy exe to prevent installing too liberal TrkApp
-*  Version     : %version: 8 %
+*  Version     : %version: 7 %
 *
 */
 
@@ -26,8 +26,9 @@
 // This component is built-in'.
 
 
-
-#include <platform_paths.hrh>
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+  #include <platform_paths.hrh>
+#endif
 
 
 CAPABILITY      None
@@ -45,9 +46,13 @@
 SOURCE          TrkDummy.cpp
 SOURCE          TrkDummyApplication.cpp
 
-USERINCLUDE     ../inc
+USERINCLUDE     ../inc 
+#if defined (__SERIES60_30__) || defined(__SERIES60_31__)
+	SYSTEMINCLUDE	/epoc32/include  
+#else
+    MW_LAYER_SYSTEMINCLUDE    
+#endif
 
-MW_LAYER_SYSTEMINCLUDE    
 
 LIBRARY         euser.lib
 LIBRARY         apparc.lib

--- a/cpsecplugins/common.pri	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2009 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: controlpanel project - common qmake settings
-#
-
-CONFIG += debug_and_release 
-
-# On win32 and mac, debug and release libraries are named differently.
-# We must follow the debug and release settings Qt was compiled with:
-# build debug iff Qt built debug, build release iff Qt built release.
-
-win32|mac {
-    !contains(QT_CONFIG,debug)|!contains(QT_CONFIG,release) {
-        CONFIG -= debug_and_release debug release
-        contains(QT_CONFIG,debug):  CONFIG+=debug
-        contains(QT_CONFIG,release):CONFIG+=release
-    }
-}
-
-CONFIG(debug, debug|release) {
-    SUBDIRPART = debug
-} else {
-    SUBDIRPART = release
-}
-
-win32 { 
-    DESTDIR = C:/ControlPanel/$$SUBDIRPART/bin
-    OBJECTS_DIR = $$PWD/../$$SUBDIRPART/tmp/$$TARGET
-}
-
-# Add the output dirs to the link path too
-LIBS += -L$$DESTDIR
-
-MOC_DIR = moc
-OBJECT_DIR = obj
-RCC_DIR = rcc
-
-#For some reason the default include path doesn't include MOC_DIR on symbian
-symbian {
-    INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-    INCLUDEPATH += $$MW_LAYER_PLATFORM_EXPORT_PATH(cplogger)
-    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-    INCLUDEPATH += $$MOC_DIR
-    TARGET.CAPABILITY = ALL -TCB
-    TARGET.EPOCALLOWDLLDATA = 1
-}
-
-INCLUDEPATH += $$PWD/inc
-win32 {
-    # add platfrom API for windows
-    INCLUDEPATH += $$PWD/../../controlpanel/controlpanel_plat/inc
-}
-
-
-

--- a/cpsecplugins/cpadvancedsecplugin/group/advancedsecplugin.pri	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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: advancedsecplugin source files
-
-# Input
-HEADERS += ../inc/cpcertdatacontainer.h \
-	../inc/cpcertdetailview.h \
-	../inc/cpcertmanuisyncwrapper.h \
-	../inc/cpcerttrustview.h \
-	../inc/cpcertview.h \
-	../inc/cpcertpluginloader.h \
-	../inc/cpsecurityview.h \
-	../inc/cpuitrustids.h \
-	../inc/cpsecmodview.h \
-	../inc/cpsecmodmodel.h \
-	../inc/cpsecmodsyncwrapper.h \
-	../inc/cpmoduleview.h \
-	../inc/cpsecmoduleinfoview.h
-
-SOURCES += ../src/cpcertdatacontainer.cpp \
-	../src/cpcertdetailview.cpp \
-	../src/cpcertmanuisyncwrapper.cpp \
-	../src/cpcerttrustview.cpp \
-	../src/cpcertview.cpp \
-	../src/cpcertpluginloader.cpp \
-	../src/cpsecurityview.cpp \
-	../src/cpsecmodview.cpp \
-	../src/cpsecmodsyncwrapper.cpp \
-	../src/cpsecmodmodel.cpp \
-	../src/cpmoduleview.cpp \
-	../src/cpsecmoduleinfoview.cpp
-	

--- a/cpsecplugins/cpadvancedsecplugin/group/advancedsecplugin.pro	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-
-#
-# Copyright (c) 2009 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: 
-#
-
-TEMPLATE = lib
-TARGET = cpadvancedsecplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( advancedsecplugin.pri )
-include ( ../rom/cpsecplugins_rom.pri )
-
-symbian: { 
-	TARGET.CAPABILITY = CAP_ECOM_PLUGIN
-	TARGET.UID3 = 0X2002E684
-	INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-	INCLUDEPATH += ../inc
-	TARGET.EPOCALLOWDLLDATA = 1
-	LIBS += -lcertstore
-	LIBS += -lCTFramework
-	LIBS += -lX509
-	LIBS += -lpkixcert
-	LIBS += -lx509certnameparser
-	LIBS += -lhash
-	LIBS += -lcryptography
-	LIBS += -lDevTokenClient
-	LIBS += -lcrypto
-	LIBS += -lefsrv
-
-	PLUGIN_STUB_PATH = /resource/qt/plugins/controlpanel
-		
-	deploy.path = C:
-	pluginstub.sources = $${TARGET}.dll
-	pluginstub.path = $$PLUGIN_STUB_PATH
-	DEPLOYMENT += pluginstub
-
-    qtplugins.path = $$PLUGIN_STUB_PATH
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-     
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin  $$deploy.path$$qtplugins.path/$$basename(qtplugin)" 
-	}
-
-TRANSLATIONS= certificate_manager.ts

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpcertdatacontainer.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +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:   Declaration of the CCertManUIKeeper class
-*
-*/
-
-#ifndef  CPCERTDATACONTAINER_H
-#define  CPCERTDATACONTAINER_H
-
-// INCLUDES
-#include <unifiedcertstore.h>
-#include <mctwritablecertstore.h>
-#include <unifiedkeystore.h>
-
-// FORWARD DECLARATIONS
-class CpCertManUISyncWrapper;
-class CpCertManUICertData;
-
-// CONSTANTS
-const TUid KCMDeviceCertStoreTokenUid = { 0x101FB668 };
-const TUid KCMDeviceKeyStoreTokenUid = { 0x101FB66A };
-const TUid KCMTrustedServerTokenUid = { 0x101FB66F };
-const TUid KCMFileKeyStoreTokenUid = { 0x101F7333 };
-const TUid KCMFileCertStoreTokenUid = { 0x101F501A };
-
-
-// CLASS DECLARATION
-
-/**
-*  CpCertDataContainer retrieves and holds certificates.
-*
-*/
-class CpCertDataContainer : public CBase
-    {
-    public: // functions
-
-        /**
-        * Default constructor
-        */
-		CpCertDataContainer();
-
-        /**
-        * Destructor.
-        */
-        ~CpCertDataContainer();
-
-        /**
-        * NewL
-        */
-        static class CpCertDataContainer* NewL();
-
-        /**
-        * NewLC
-        */
-        static class CpCertDataContainer* NewLC();
-
-        CUnifiedCertStore*& CertManager();
-
-        CUnifiedKeyStore*& KeyManager();
-
-        /**
-        * Checks that cacerts.dat file is not corrupt
-        * and returns CA certificates from it.
-        */
-        void RefreshCAEntriesL();
-
-        /**
-        * Checks that cacerts.dat file is not corrupt
-        * and returns user certificates from it.
-        */
-        void RefreshUserCertEntriesL();
-
-        /**
-        * Returns peer certificates.
-        */
-        void RefreshPeerCertEntriesL();
-
-        /**
-        * Returns peer certificates.
-        */
-        void RefreshDeviceCertEntriesL();
-
-        /**
-        * Shows error note
-        */
-        void ShowErrorNoteL(TInt aError);
-
-    public: //data
-
-        /**
-        * To store CA certificate entries for Authority and Trust view
-        * Includes label from x509certnameparser.
-        */
-        RMPointerArray<CpCertManUICertData>     iCALabelEntries;
-
-        /**
-        * To store CA certificate entries for Authority and Trust view
-        * Includes label from x509certnameparser.
-        */
-        RMPointerArray<CpCertManUICertData>     iUserLabelEntries;
-
-        /**
-        * To store Peer certificate entries for Trusted Site view
-        * Includes label from x509certnameparser.
-        */
-        RMPointerArray<CpCertManUICertData>     iPeerLabelEntries;
-
-        /**
-        * To store Peer certificate entries for Device certificate view
-        * Includes label from x509certnameparser.
-        */
-        RMPointerArray<CpCertManUICertData>     iDeviceLabelEntries;
-
-        /**
-        * Used to wrap asynchronous calls
-        */
-        CpCertManUISyncWrapper*          iWrapper;
-
-        /**
-        * File session handle.
-        */
-        RFs                             iRfs;
-
-    private: // functions
-
-        void ConstructL();
-
-    private: //data
-
-        /**
-        * To list certificates with criteria.
-        */
-        CCertAttributeFilter*   iFilter;
-
-        /**
-        * To list keys with criteria.
-        */
-
-        TCTKeyAttributeFilter*    iKeyFilter;
-
-        /**
-        * UnifiedCertStore
-        */
-        CUnifiedCertStore*    iStore;
-
-        /**
-        * UnifiedKeyStore
-        */
-        CUnifiedKeyStore*   iKeyStore;
-
-        /**
-        * To store CA certificate entries.
-        */
-        RMPointerArray<CCTCertInfo>     iCAEntries;
-
-        /**
-        * To store User certificate entries.
-        */
-        RMPointerArray<CCTCertInfo>     iUserEntries;
-
-        /**
-        * To store Peer certificate entries.
-        */
-        RMPointerArray<CCTCertInfo>     iPeerEntries;
-
-        /**
-        * To store Device certificate entries.
-        */
-        RMPointerArray<CCTCertInfo>     iDeviceEntries;
-
-        /**
-        * To store Key entries
-        */
-        RMPointerArray<CCTKeyInfo>      iKeyEntries;
-
-   };
-
-/**
-*  Small helper class to put label and certificate in same class.
-*
-*/
-class CpCertManUICertData : public CBase
-    {
-    public:
-
-	CpCertManUICertData();
-
-        void Release();
-
-        HBufC* iCAEntryLabel;
-        HBufC* iUserEntryLabel;
-        HBufC* iPeerEntryLabel;
-        HBufC* iDeviceEntryLabel;
-        CCTCertInfo* iCAEntry;
-        CCTCertInfo* iUserEntry;
-        CCTCertInfo* iPeerEntry;
-        CCTCertInfo* iDeviceEntry;
-
-    private:
-        ~CpCertManUICertData();
-
-    };
-
-
-#endif // CPCERTDATACONTAINER_H

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpcertdetailview.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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:  
-*
-*/
-
-#ifndef CPCERTDETAILVIEW_H
-#define CPCERTDETAILVIEW_H
-
-#include <cpbasesettingview.h>
-#include <cpcertview.h>
-#include <pkixcertchain.h>
-#include <cctcertinfo.h>
-
-class CpCertDataContainer;
-class CX509Certificate;
-class CCertificate;
-class HbListWidget;
-class HbAbstractViewItem;
-class CCTCertInfo;
-
-class QString;
-class QSizeF;
-
-class CpCertDetailView : public CpBaseSettingView
-{
-    Q_OBJECT
-public:
-    explicit CpCertDetailView(	CpCertView::TCertificateViews currentView, TInt pos, 
-										CpCertDataContainer& certDataContainer, 
-										QGraphicsItem *parent = 0 );
-    virtual ~CpCertDetailView();
-    
-private:
-    void viewCertificateDetailsL( TInt index, CpCertView::TCertificateViews type );
-    void validateCertificateL(TInt index, const CCertificate& certDetails, const CCTCertInfo& certInfo, CpCertView::TCertificateViews type );
-    CArrayFixFlat<TValidationError>* validateX509CertificateL( const CX509Certificate& certDetails );
-    TKeyUsagePKCS15 keyUsageAndLocationL( const CCTCertInfo& certEntry, TUid* keyLocation );
-    void setLocationInfo( TBool certificate, TUid locUid, HbListWidget& certDisplayDetails );
-    void divideIntoBlocks( const TDesC8& input, TPtr& output );
-
-    void addToListWidget(	HbListWidget& certDisplayDetails, const QString& data );
-    void addToListWidget(	HbListWidget& certDisplayDetails, 
-							const QString& displayString, const QString& displayDetails );
-        
-    const CCTCertInfo* certInfo( TInt index, CpCertView::TCertificateViews certView );
-    void addTrustedSitesL( const CCertificate& certDetails, HbListWidget& certDisplayDetails);
-    void addLabel( const CCTCertInfo& certInfo, HbListWidget& certDisplayDetails);
-    void addIssuerL( const CCertificate& certDetails, HbListWidget& certDisplayDetails );
-    void addSubjectL( const CCertificate& certDetails, HbListWidget& certDisplayDetails );
-    void addCertUsage( TKeyUsagePKCS15 usage, HbListWidget& certDisplayDetails );
-    void addValidityPeriod( const CCertificate& certDetails, HbListWidget& certDisplayDetails);
-    void setURLLocation( HBufC8& urlDetails, HbListWidget& certDisplayDetails );
-    void addCertFormat( TCertificateFormat certFormat, HbListWidget& certDisplayDetails );
-    void addAlgoDetails( const CCertificate& certificate, HbListWidget& certDisplayDetails );
-    void addSerialNo( const CCertificate& certificate,	HbListWidget& certDisplayDetails );
-    void addFingerprint( const CCertificate& certificate, HbListWidget& certDisplayDetails );
-    void addPublicKeyDetailsL(	const CCertificate& certificate, HbListWidget& certDisplayDetails );
-    QString asymmetricAlgoId( const CCertificate& certificate );
-    
-private:
-   CpCertDataContainer& mCertDataContainer;
-  
-};
-
-#endif // CPCERTDETAILVIEW_H 

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpcertmanuisyncwrapper.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,319 +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:   Wrapper class for Symbian's Security Framework's calls
-*
-*/
-
-
-#ifndef     CPCERTMANUISYNCWRAPPER_H
-#define     CPCERTMANUISYNCWRAPPER_H
-
-
-// INCLUDES
-#include <e32base.h>
-
-// FORWARD DECLERATIONS
-class CCertificate;
-class CPKIXValidationResult;
-class CPKIXCertChain;
-class CUnifiedCertStore;
-
-// CLASS DECLARATION
-
-/**
-*  Wrapper class for Symbian's Security Framework's calls.
-*  Shows error notes if an error happenes.
-*
-*  @lib certmanui.dll
-*  @since S60 2.0
-*/
-class CpCertManUISyncWrapper : public CActive
-    {
-    public:
-
-        /**
-        * Two-phased constructor.
-        */
-        static CpCertManUISyncWrapper* NewLC();
-
-        /**
-        * Two-phased constructor.
-        */
-        static CpCertManUISyncWrapper* NewL();
-
-        /**
-        * Destructor.
-        */
-        ~CpCertManUISyncWrapper();
-
-    public: // New functions
-
-        /**
-        * TInt ListL
-        * @param aStore reference to store where operation is done.
-        * @param aArray Keys are stored here.
-        * @param aFilter Information on what kind keys are looked.
-        */
-
-        void ListL( CUnifiedKeyStore*& aStore,
-            RMPointerArray<CCTKeyInfo>* aArray,
-            const TCTKeyAttributeFilter& aFilter );
-
-        /**
-        * TInt ListL
-        * @param aStore reference to store where operation is done.
-        * @param aArray Keys are stored here.
-        * @param aFilter Information on what kind keys are looked.
-        * @param aTokenUid Token UID of key store
-        */
-
-        void ListL( CUnifiedKeyStore*& aStore,
-            RMPointerArray<CCTKeyInfo>* aArray,
-            const TCTKeyAttributeFilter& aFilter,
-            const TUid aTokenUid );
-
-        /**
-        * TInt ListL
-        * @param aStore reference to store where operation is done.
-        * @param aArray certificates are stored here.
-        * @param aFilter Information on what kind certificates are looked.
-        */
-        void ListL( CUnifiedCertStore*& aStore,
-            RMPointerArray<CCTCertInfo>* aArray,
-            const CCertAttributeFilter& aFilter );
-
-        /**
-        * TInt ListL
-        * @param aStore reference to store where operation is done.
-        * @param aArray certificates are stored here.
-        * @param aFilter Information on what kind certificates are looked.
-        * @param aTokenUid Token UID of certificate store
-        */
-        void ListL( CUnifiedCertStore*& aStore,
-            RMPointerArray<CCTCertInfo>* aArray,
-            const CCertAttributeFilter& aFilter,
-            const TUid aTokenUid );
-
-
-        /**
-        * TInt GetCertificateL
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate that's detailed information is fetched.
-        * @param aCert Fetched certificate.
-        */
-        void GetCertificateL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo, CCertificate*& aCert );
-
-        /**
-        * TInt GetCertificateL
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate that's detailed information is fetched.
-        * @param aCert Fetched certificate.
-        */
-        void GetCertificateL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo, CCertificate*& aCert, TUid aTokenUid );
-
-
-        /**
-        * TInt GetUrlCertificateL
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate that's detailed information is fetched.
-        * @param aUrl Fetched URL.
-        */
-        void GetUrlCertificateL(
-            CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo,
-            TDes8& aUrl)            ;
-
-        /**
-        * TInt GetApplicationsL
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate that applications are fetched.
-        * @param Certificates applications are stoted here.
-        */
-        void GetApplicationsL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo, RArray<TUid>& aApps );
-
-        /**
-        * TInt ValidateX509RootCertificateL
-        * @param aValidationResult Result of validation.
-        * @param aValidationTime Time of validation.
-        * @param aChain Chain to be validated.
-        */
-        void ValidateX509RootCertificateL(
-            CPKIXValidationResult*& aValidationResult,
-            const TTime& aValidationTime, CPKIXCertChain*& aChain );
-
-        /**
-        * TInt InitStoreL
-        * @param aStore reference to store to be initialized.
-        */
-        void InitStoreL( CUnifiedCertStore*& aStore );
-
-        /**
-        * void InitStoreL
-        * @param aStore reference to store to be initialized.
-        */
-        void InitStoreL( CUnifiedKeyStore*& aStore );
-
-        /**
-        * TInt DeleteCertL
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate to be deleted.
-        */
-        void DeleteCertL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo );
-
-        /**
-        * TInt DeleteCertL
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate to be deleted.
-        */
-        void DeleteCertL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo,
-            TUid aTokenUid );
-
-        /**
-        * TInt IsApplicableL
-        * @since S60 2.0
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate thats applicability is queried.
-        * @param aApplication Application that's status is queried.
-        * @param aIsApplicable ETrue if applcable.
-        * @return TInt Status Symbian's API's call.
-        */
-        TInt IsApplicableL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo, TUid aApplication,
-        TBool& aIsApplicable );
-
-        /**
-        * TInt IsTrustedL
-        * @since S60 2.0
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate that's trust status is queried.
-        * @param aTrusted ETrue if trusted.
-        * @return TInt Status Symbian's API's call.
-        */
-        TInt IsTrustedL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo, TBool& aTrusted );
-
-        /**
-        * TInt SetApplicabilityL
-        * @param aStore reference to store where operation is done.
-        * @param aCertInfo Certificate thats applicability is set.
-        * @param aApplications New applicability settings.
-        */
-        void SetApplicabilityL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo,
-            RArray<TUid>& aApplications );
-
-      /**
-        * void MoveCertL
-        * @since S60 3.2
-        * @param aStore reference to store where operation is done
-        * @param aCertInfo Certificate info
-        * @param aSourceStore UID of source certificate store
-        * @param aTargetStore UID of source certificate store
-        * @return TInt Number of moved certificates
-        */
-        TInt MoveCertL( CUnifiedCertStore*& aStore,
-            const CCTCertInfo& aCertInfo,
-            const TUid aSourceTokenId,
-            const TUid aTargetTokenId );
-
-      /**
-        * void MoveKeyL
-        * @param aStore reference to store where operation is done
-        * @param CCTKeyInfo Key info
-        * @param aSourceStore UID of source key store
-        * @param aTargetStore UID of source key store
-        */
-        void MoveKeyL( CUnifiedKeyStore*& aStore,
-            const TCTKeyAttributeFilter& aFilter,
-            const TUid aSourceTokenId,
-            const TUid aTargetTokenId );
-
-        /**
-        * TInt GetInterface
-        * @since S60 3.0
-        * @param aToken reference to token
-        * @param aTokenInterface Pointer to returned interface
-        * @return TInt Status Symbian's API's call.
-        */
-        TInt GetInterface( TUid aRequiredInterface,
-            MCTToken& aToken,
-            MCTTokenInterface*& aReturnedInterface );
-
-    protected:
-
-        void DoCancel();
-        void RunL();
-
-    private:
-
-        CpCertManUISyncWrapper();
-        void ConstructL();
-
-        void HandleErrorL();
-
-    private:    //Data
-
-        // Internal operation states.
-        enum TOperation
-            {
-            EOperationNone,
-            EOperationInit,
-            EOperationList,
-            EGetCertificate,
-            EAddCertificate,
-            ERetriveURLCertificate,
-            EOperationDelete,
-            EOperationGetApps,
-            EOperationIsApplicable,
-            EOperationIsTrusted,
-            EOperationSetApplicability,
-            EOperationSetToTrusted,
-            EOperationValidateX509Root,
-            EShowErrorNote,
-            EOperationInitKeyStore,
-            EOperationKeyList,
-            EOperationGetInterface,
-            EOperationExportKey,
-            EOperationImportKey,
-            EOperationDeleteKey
-            };
-
-        // For wrapping asynchronous calls.
-        CActiveSchedulerWait    iWait;
-
-        // Internal state of operation.
-        TOperation              iOperation;
-
-        // Just for cancelling a operation. Does not own.
-        CUnifiedCertStore*      iStore;
-
-        // Just for cancelling a operation. Does not own.
-        CUnifiedKeyStore*       iKeyStore;
-
-        // Just for cancelling a operation. Does not own.
-        CPKIXCertChain*         iChain;
-
-        // For retrieving a certificate.
-        TPtr8                   iCertPtr;
-
-    };
-
-#endif // CPCERTMANUISYNCWRAPPER_H
-
-// End of File

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpcertpluginloader.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:  
- *   
- */
-#ifndef	CPCERTPLUGINLOADER_H
-#define	CPCERTPLUGINLOADER_H
-
-#include <qobject.h>
-#include <cpplugininterface.h>
-#include <QTranslator>
-class CpCertPluginLoader : public QObject, public CpPluginInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(CpPluginInterface)
-public:
-    CpCertPluginLoader();
-    virtual ~CpCertPluginLoader();
-      virtual QList<CpSettingFormItemData*>createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-private:
-	  QTranslator* mTranslator;
-};
-
-#endif	//CPCERTPLUGINLOADER_H

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpcerttrustview.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +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:   Declaration of the CCertManUIContainerTrust class
-*                Maintains correct list of trusted clients depending
-*                on the certificate that was in focus in Authority
-*                certificates view when Trust Settings view was entered.
-*                Shows and changes correct Yes/No text for the Trusted client.
-*
-*/
-
-
-#ifndef  CPCERTTRUSTVIEW_H
-#define  CPCERTTRUSTVIEW_H
-
-// INCLUDES
-#include <cpbasesettingview.h>
-#include <QList>
-
-// CONSTANTS
-const TInt KTrustSettingsResourceIndexWAP = 0;
-const TInt KTrustSettingsResourceIndexMailAndImageConn = 1;
-const TInt KTrustSettingsResourceIndexAppCtrl = 2;
-const TInt KTrustSettingsResourceIndexJavaInstall = 3;
-const TInt KTrustSettingsResourceIndexOCSPCheck = 4;
-const TInt KTrustSettingsResourceIndexVPN = 5;
-const TInt KTrustSettingsResourceIndexWidget = 6;
-const TInt KTrustSettingsResourceIndexValueYes = 0;
-const TInt KTrustSettingsResourceIndexValueNo = 1;
-
-// FORWARD DECLARATIONS
-class CCertificateAppInfoManager;
-class CpCertDataContainer;
-class TCertificateAppInfo;
-class CCTCertInfo;
-
-class QString;
-
-class HbDataFormModel;
-
-// CLASS DECLARATION
-class CpCertTrustView : public CpBaseSettingView
-    {
-	Q_OBJECT
-	
-	public:
-	    explicit CpCertTrustView( 	TInt certificateIndex,	
-									CpCertDataContainer& certDataContainer,
-									QGraphicsItem *parent = 0 );
-	    virtual ~CpCertTrustView();
-	    void saveTrustSettings();
-	    
-	private:
-	    void viewTrustSettings();
-	    void updateListBoxL();
-	    TInt trustIdIndex( TUid aTrusterUid ) const;
-	    TBool checkCertificateClientTrustL( const TUid clientUid, const CCTCertInfo& entry ) const;
-	    TUid trusterId(const QString& clientDescription) const;
-	    
-	private:
-	    CpCertDataContainer& mCertDataContainer;
-	    /**
-		* Application manager class, used to get applications in system.
-		*/
-		CCertificateAppInfoManager*   mAppInfoManager;
-        
-		/**
-        * Client Uids of the certstore
-        */
-        RArray<TUid> mClientUids;
-
-        /**
-		* To get the names of the trusted clients from the resources
-		*/
-		QList<QString>   mTrustedClients;
-
-		/**
-		* To get the yes/no trust texts from the resources
-		*/
-		QList<QString>   mTrustValues;
-		
-		TInt mCertificateIndex;
-		
-		HbDataFormModel* mFormModel; 
-
-    };
-
-#endif // CPCERTTRUSTVIEW_H
-
-// End of File

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpcertview.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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:  
-*
-*/
-
-#ifndef CPCERTVIEW_H
-#define CPCERTVIEW_H
-
-#include <cpbasesettingview.h>
-
-class HbAbstractViewItem;
-class CpCertDataContainer;
-class CCTCertInfo;
-class HbListView;
-class HbAction;
-class HbDialog;
-class HbMessageBox;
-class CpCertView : public CpBaseSettingView
-	{
-	Q_OBJECT
-	
-	public:
-		explicit CpCertView(const QModelIndex& index, QGraphicsItem *parent = 0);
-		virtual ~CpCertView();
-	
-	public:
-		enum TCertificateViews
-			{
-			EAuthorityView=0,
-			ETrustedView,
-			EPersonalView,
-			EDeviceView			
-			};
-		
-	public slots:
-		void displayPreviousView();
-		
-	private slots:
-		void openCertificate();
-		void openCertFromList(const QModelIndex& modelIndex);
-		void showTrustSettings();
-		void saveTrustSettings();
-		void indicateLongPress(HbAbstractViewItem*, QPointF);
-			
-		void deleteCertificate();
-		TInt refreshListL();
-		void refreshView( TInt aCount );
-		
-		void moveSelectedCert();
-		void deleteList();  
-		void selectAll();
-		void moveCert();
-		void viewDone();
-		void handleMultipleDelete(HbAction* action);
-		void handleMoveDialog(HbAction* action);
-		void handleDeleteDialog(HbAction* action);
-		void handleMoveCertDialog(HbAction* action);
-	private:
-		const CCTCertInfo* certAt(TInt index) const;
-		QString certLabel(TInt index) const;
-		void deleteCertsL( RArray<TInt>& indexList );
-		void setDetails(CpCertView::TCertificateViews currentView);
-		void moveCertList( RArray<TInt>& indexList );
-
-	private:
-		CpCertView::TCertificateViews mCertView;
-		TInt mPos;
-		CpCertDataContainer* mCertDataContainer;
-		TBool mSelectAll;
-		RArray<TInt> mSelectionIndex;
-		RArray<TInt> mIndexList;
-		
-		HbDialog* mPopup;
-		HbView* mPrevView;
-		HbView* mCurrentView;
-		CpBaseSettingView* mRefreshedView;
-		HbListView* mListView;	
-		HbListView* mSelectAllView;	
-		HbView* mOriginalView;
-		HbMessageBox* mNote;
-		HbMenu* mContextMenu;
-	};
-
-#endif /* CPCERTVIEW_H */

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpmoduleview.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +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:  
-*
-*/
-
-#ifndef CPMODULEVIEW_H
-#define CPMODULEVIEW_H
-
-#include <cpbasesettingview.h>
-#include "cpsecmodview.h"
-
-class HbAbstractViewItem;
-class CpItemDataHelper;
-class CSecModUIModel;
-class CpSecModView;
-
-class CpModuleView : public CpBaseSettingView
-{
-    Q_OBJECT
-public:
-    explicit CpModuleView( 	CpSecModView::TSecModViews currentView, 
-							CSecModUIModel& secModUIModel,
-							QGraphicsItem *parent = 0 );
-    virtual ~CpModuleView();
-    
-private slots:
-    void handleAccessView( const QModelIndex& modelIndex );
-	void handleAccessView();
-	void handleSigView();
-	void handleSigViewCommand();
-	void indicateLongPress(HbAbstractViewItem *item,QPointF coords);
-   
-private:
-    void showAccessView();
-    void showSignatureView(TBool showBlockedNote);
-
-private:
-    enum TSecModAccessCodeCommandIds
-        {
-        EIndexCodeLabel = 0,
-        EIndexCodeRequest,
-        EIndexCodeStatus 
-        };
-    
-    enum TSecModSignatureCommandIds
-        {
-        ESecModUICmdOpen = 0,
-        ESecModUICmdModuleInfo,
-        ESecModUICmdDelKeyStore,
-        ESecModUICmdChange,
-        ESecModUICmdUnblock,
-        ESecModUICmdClose,    
-        ESecModUICmdAppTest    
-        };
-
-private:
-    CpSecModView::TSecModViews mCurrentView;
-    CSecModUIModel& mSecModUIModel;
-    TInt mPos;
-    HbMenu* mContextMenu;
-};
-
-#endif /* CPMODULEVIEW_H */

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpsecmodmodel.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,341 +0,0 @@
-/*
-* Copyright (c) 2002-2009 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:   Declaration of the CSecModUIModel class 
-*
-*/
-
-
-#ifndef CSECMODUIMODEL_H
-#define CSECMODUIMODEL_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <bamdesca.h>
-#include <ct/rmpointerarray.h>
-#include <f32file.h> 
-
-#include <qlist.h>
-#include <qlabel.h>
-#include <qvector.h>
-#include <qpair.h>
-
-class QString;
-class HbListWidget;
-
-// CONSTANTS
-const TInt KMaxSettItemSize = 200;
-
-const TInt KPinGSettIndex = 0;
-const TInt KPinNrSettIndex = 1;
-
-const TUid KUidSecMod = { 0x101F8668 };
-
-// Panic strings
-_LIT(KPanicNullPointer, "SecModUI: invalid pointer");
-_LIT(KPanicIndexOutOfRange, "SecModUI: array indexed out of range");
-
-// FORWARD DECLARATIONS
-class CUnifiedKeyStore;
-class MCTAuthenticationObject;
-class MCTAuthenticationObjectList;
-class CSecModUISyncWrapper;
-class MCTKeyStore;
-class MCTToken;
-
-class QString;
-
-// FUNCTION PROTOTYPES
-GLREF_C void Panic( TInt aPanic );
-
-// CLASS DECLARATION
-
-/**
-*  class CSecModUIModel
-*  Model of the application
-*
-*  @lib SecModUI.lib
-*  @since Series 60 3.0
-*/
-class CSecModUIModel : public CBase
-    {
-    public:  // Constructors and destructLoadTokenLabelsLor
-        
-        /**
-        * Two-phased constructor.
-        */        
-        static CSecModUIModel* NewL();
-                
-        /**
-        * Destructor.
-        */
-        virtual ~CSecModUIModel();
-    
-    public: // New functions
-        /**
-		* Initializes unified keystore
-		*/
-		void InitializeKeyStoreL();
-		
-		/**
-		* Retrieves the description and location of all tokens.        
-		* @return Map containing the label and the appripriate location.
-		*/        
-		QMap<QString,QString> LoadTokenLabelsL();
-		
-		/**
-		* Shows error note if needed.        
-		* @param aError 
-		* @return void
-		*/
-		void ShowErrorNote(TInt aError) const;
-		
-		/**
-		* Retrieves the appropriate token based on the index.        
-		* @param aTokenIndex Index of the token to be opened.
-		* @return void
-		*/
-		void OpenTokenL(TInt aTokenIndex);
-		
-		/**
-		* Initialize the auth objects and return the total count.
-		* @param aItemArray contains localised stings 
-		* @return void
-		*/
-		TInt CheckCodeViewStringsL();
-		
-		/**
-		* Retrieves description of the token based on UID of the current active keystore.                
-		* @return Description
-		*/
-		QString TokenLabelForTitle() const;
-		
-		/**
-		 * Returns status of the selected auth object.
-		 * @param index
-		 * @return status
-		 */
-		TUint32 AuthStatus(TInt aIndex) const;
-		
-		/**
-		* Returns status of the auth object based on its persistent properties set
-		* by security module implementation.        
-		* @param aIndex Index of the authentication object
-		* @param aShowBlockedNote If ETrue, shows code blocked if code is blocked.
-		* @return status of the pin.
-		*/
-		QString PINStatus( TInt aIndex, TBool aShowBlockedNote ) const;
-		
-		/**
-		* Checks whether the Pin is still available.
-		* @param aIndex Index of the authentication object.
-		* @return status
-		*/
-		TBool PinOpen(TInt aIndex) const;
-		
-		/**
-		* Based on the property of auth object the pin can be 
-		* changed or unblocked.        
-		* @param aIndex Index of the auth object
-		* @return ?description
-		*/
-		void ChangeOrUnblockPinL(TInt aIndex);
-		
-		 /**
-		* Changes the value of the PIN.
-		* @param aIndex Index of the AO
-		* @return void
-		*/
-		void ChangePinL(TInt aIndex);
-		
-		/**
-		* Toggles the value of auth object if possible.        
-		* @param ?arg1 ?description
-		* @return ?description
-		*/
-		TInt ChangeCodeRequest(TInt aIndex);
-
-		/**
-		* If the auth object is open then closes it.       
-		* @param aIndex Index of the AO to be closed.
-		* @return void
-		*/
-		void CloseAuthObjL(TInt aIndex);
-	     
-		 /**
-		* Unblocks PIN
-		* @param aIndex Index of the AO
-		* @return void
-		*/
-		void UnblockPinL(TInt aIndex);
-		
-		/**
-		* Deletes key from the appropriate keystore.      
-		* @param aTokenIndex Index of the token to be deleted.
-		* @return ETrue if keystore was deleted.
-		*/
-		void DeleteKeysL(TInt aTokenIndex);
-		 
-		/**
-		* Returns ETrue if PIN is changeable.        
-		* @param aIndex Index of the AO
-		* @return ETrue / EFalse
-		*/
-		TBool PinChangeable(TInt aIndex) const;
-				
-		/**
-		* Displays security module details dialog.        
-		* @param aTokenIndex Index of the token, which details are shown.
-		* @return void
-		*/
-		QVector< QPair<QString,QString> > SecModDetailsL(TInt aTokenIndex);
-		
-		/**
-		* Displays details dialog of the active security module .                        
-		* @return void
-		*/
-		QVector< QPair<QString,QString> > GetSecModDetailsL();
-		
-		/**
-		* Appends the location of the keystore.                        
-		* @return void
-		*/
-		void AppendLocation( QVector< QPair<QString,QString> >& aSecModDetails, 
-							 TUid aLocUid, 
-							 QString aCertDisplayDetails );
-		
-		/**
-		* Appends the value of a label if present otherwise appends empty descriotion.                        
-		* @return void
-		*/
-		void AppendItem( 	QVector< QPair<QString,QString> >& aSecModDetails, 
-							QString aLabel, 
-							const TDesC& aValue, 
-							QString aNullDescription );
-		
-		/**
-		* Generate details of signing security module.                        
-		* @return void
-		*/
-		void AppendPinNRs(QVector< QPair<QString,QString> >& aSecModDetails);
-
-		QVector< QPair<QString, TUint32> > AuthDetails();
-		
-		/**
-		* Changes PIN-NR
-		* @param aIndex Index of the AO
-		* @return void
-		*/
-		void ChangePinNrL(TInt aIndex);
-		       
-		/**
-		* Unblocks PIN-NR
-		* @param aIndex Index of the AO
-		* @return void
-		*/
-		void UnblockPinNrL(TInt aIndex);
-		
-		/**
-		 * Retrieves the UID of the current active keystore.
-		 * @return uid
-		 */
-		TInt KeyStoreUID();     
-		
-		/**
-		 * Retrieves the auth object at the speficied index.
-		 * @return auth object
-		 */
-		const MCTAuthenticationObject& AuthObj(TInt aIndex);
-		
-		/**
-		* Returns ETrue if PIN is unblockable.        
-		* @param aIndex Index of the AO
-		* @return ETrue / EFalse
-		*/
-		TBool PinUnblockable(TInt aIndex) const;
-		        
-		        
-		/**
-		* Returns ETrue if PIN request can be disabled / enabled.        
-		* @param aIndex Index of the AO
-		* @return ETrue / EFalse
-		*/
-		TBool PinRequestChangeable(TInt aIndex) const;
-		
-		/**
-		* Returns ETrue if token is deletable.
-		* @param aTokenIndex Index of the token to be deleted.
-		* @return ETrue / EFalse
-		*/
-		TBool IsTokenDeletable(TInt aTokenIndex);
-		        
-		
-    private:
-
-        /**
-        * C++ default constructor.
-        */        
-        CSecModUIModel();
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();        
-        
-        void ResetAndDestroyCTObjects();
-        
-        void ResetAndDestroyAOs();
-        
-        void InitAuthObjectsL();
-        
-        void ListAuthObjectsL();
-        
-        void CreateSettingItem(const TDesC& aTitle, 
-                               const TDesC& aValue,  
-                               TDes& aItem) const;
-        
-        QString Location( TUid aUid ) const;         
-        
-        void AppendPinNRsL( TDes& aMessage ) const;   
-
-    private:
-        // DATA TYPES
-        enum TSecModPanicCode
-            {
-            EPanicNullPointer,
-            EPanicIndexOutOfRange
-            };
-
-    private:    // Data
-        // Resource file offsets		
-		TInt		iResourceFileOffset;
-		TInt        iResourceFileOffset2;
-		TInt        iResourceFileOffset3;
-		
-		CSecModUISyncWrapper* iWrapper; // owned
-		RFs iRfs;
-		
-		/**
-        * Crypto Token objects
-        */
-        CUnifiedKeyStore* iUnifiedKeyStore; // owned
-        MCTKeyStore* iKeyStore; // not owned
-        MCTAuthenticationObjectList*  iAOList; // owned, items not owned
-        RMPointerArray<MCTAuthenticationObject> iAOArray; // items not owned		
-		                                         
-        RMPointerArray<MCTKeyStore> iAOKeyStores; // items not owned       		                                         
-    };
-
-#endif      // CSECMODUIMODEL_H   
-            
-// End of File

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpsecmodsyncwrapper.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/*
-* Copyright (c) 2005-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:   Wrapper class for Symbian's Security Framework's calls.
-*
-*/
-
-#ifndef CPSECMODUISYNCWRAPPER_H
-#define CPSECMODUISYNCWRAPPER_H
-
-#include <e32base.h>
-#include <f32file.h>
-#include <ct/rcpointerarray.h>
-#include <ct/rmpointerarray.h>
-#include <mctkeystore.h>
-
-class MCTToken;
-class MCTAuthenticationObject;
-class MCTAuthenticationObjectList;
-class CUnifiedKeyStore;
-class MCTTokenInterface;
-class TCTTokenObjectHandle;
-
-
-
-/**
-*  class CSecModUISyncWrapper
-*  Wrapper class for Symbian's Security Framework's calls.
-*
-*  @lib wimmanui.dll
-*  @since Series 60 2.0
-*/
-class CSecModUISyncWrapper : public CActive
-    {
-    public:     // Constructors and destructor
-
-        static CSecModUISyncWrapper* NewLC();
-        static CSecModUISyncWrapper* NewL();
-        virtual ~CSecModUISyncWrapper();
-
-    public:     // New functions
-
-        TInt Initialize(CUnifiedKeyStore& aKeyStore );
-
-        TInt OpenWIM();
-
-        TInt GetAuthObjectInterface(
-            MCTToken& aToken,
-            MCTTokenInterface*& aTokenInterface);
-
-        TInt ListAuthObjects(
-            MCTAuthenticationObjectList& aAuthObjList,
-            RMPointerArray<MCTAuthenticationObject>& aAuthObjects );
-
-        TInt ListKeys(
-            MCTKeyStore& aKeyStore,
-            RMPointerArray<CCTKeyInfo>& aKeysInfos,
-		    const TCTKeyAttributeFilter& aFilter);
-
-	    TInt DeleteKey(
-	        CUnifiedKeyStore& aKeyStore,
-	        TCTTokenObjectHandle aHandle);
-
-        TInt ChangeReferenceData( MCTAuthenticationObject& aAuthObject );
-
-        TInt UnblockAuthObject( MCTAuthenticationObject& aAuthObject );
-
-        TInt EnableAuthObject( MCTAuthenticationObject& aAuthObject );
-
-        TInt DisableAuthObject( MCTAuthenticationObject& aAuthObject );
-
-        TInt CloseAuthObject( MCTAuthenticationObject& aAuthObject );
-
-        TInt TimeRemaining( MCTAuthenticationObject& aAuthObject, TInt& aStime );
-
-    protected:      // From CActive
-
-        void DoCancel();
-	    void RunL();
-
-    private:        // New functions
-
-        CSecModUISyncWrapper();
-
-    private:        // Data
-
-        // Internal operation states.
-        enum TOperation
-            {
-            EOperationInit,
-            EOperationGetAOInterface,
-            EOperationListAOs,
-            EOperationListKeys,
-            EOperationDelKey,
-            EOperationChangeReferenceData,
-            EOperationUnblockAO,
-            EOperationEnableAO,
-            EOperationDisableAO,
-            EOperationCloseAO,
-            EOperationTimeRemAO,
-            EOperationNone
-            };
-
-        // For wrapping asynchronous calls.
-        CActiveSchedulerWait    iWait;
-
-        // Internal state of operation.
-        TOperation              iOperation;
-
-        // CT objects
-        TAny* iObject;
-    };
-
-
-#endif // CPSECMODUISYNCWRAPPER_H

--- a/cpsecplugins/cpadvancedsecplugin/inc/cpsecmoduleinfoview.h	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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:  
-*
-*/
-
-#ifndef CPSECMODULEINFOIEW_H
-#define CPSECMODULEINFOIEW_H
-
-#include <cpbasesettingview.h>
-
-
-
-class CpSecmoduleInfoView : public CpBaseSettingView
-{
-    Q_OBJECT
-public:
-    explicit CpSecmoduleInfoView(const QVector< QPair<QString,QString> >& securityDetails,QGraphicsItem *parent = 0);
-    virtual ~CpSecmoduleInfoView();
-		
-public slots:
-
-    
-private:
-
-
-};
-
-#endif // CPSECMODULEINFOIEW_H