diff -r 09b1ac925e3f -r 03674e5abf46 pkiutilities/untrustedcertificatedialog/src/untrustedcertificatewidget_symbian.cpp
--- a/pkiutilities/untrustedcertificatedialog/src/untrustedcertificatewidget_symbian.cpp	Tue Aug 31 16:04:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +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:  Device dialog plugin that shows untrusted certificate
-*               dialog for TLS server authentication failure errors.
-*
-*/
-
-#include "untrustedcertificatewidget.h"
-#include "untrustedcertificatedefinitions.h"
-#include "untrustedcertificateinfobase.h"
-#include "untrustedcertificateinfo_symbian.h"
-#include <securitydefs.h>                           // TValidationError
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ----------------------------------------------------------------------------
-// UntrustedCertificateWidget::isInvalidCertificate()
-// ----------------------------------------------------------------------------
-//
-bool UntrustedCertificateWidget::isCertificateValid()
-{
-    return (mValidationError != ESignatureInvalid && mValidationError != ECertificateRevoked);
-}
-
-// ----------------------------------------------------------------------------
-// UntrustedCertificateWidget::processEncodedCertificate()
-// ----------------------------------------------------------------------------
-//
-void UntrustedCertificateWidget::processEncodedCertificate(const QByteArray &encodedCert)
-{
-    UntrustedCertificateInfoBase *info = new UntrustedCertificateInfoSymbian(encodedCert);
-    if (mCertificateInfo) {
-        delete mCertificateInfo;
-        mCertificateInfo = 0;
-    }
-    mCertificateInfo = info;
-}
-
-// ----------------------------------------------------------------------------
-// UntrustedCertificateWidget::descriptionText()
-// ----------------------------------------------------------------------------
-//
-QString UntrustedCertificateWidget::descriptionText()
-{
-    QString text;
-    if (!isCertificateValid()) {
-        //: Information note text shown if the server certificate has an invalid signature
-        // TODO: localised UI string
-        text = tr("'%1' has sent an invalid certificate. Connection cannot be created.");
-    } else if (mValidationError == EValidatedOK || mValidationError == EDateOutOfRange) {
-        bool isDateValid = mCertificateInfo->isDateValid();
-        bool isSiteValid = mCertificateInfo->commonNameMatches(mServerName);
-        if (!isDateValid && !isSiteValid) {
-            // TODO: hbTrId("txt_untrustedcert_dialog _accept_site_ood")
-            text = tr("'%1' has sent a certificate with different site name and which is out of date. Accept anyway?");
-        } else if (!isSiteValid) {
-            // TODO: hbTrId("txt_untrustedcert_dialog _accept_site"
-            text = tr("'%1' has sent a certificate with different site name. Accept anyway?");
-        } else {
-            // TODO: hbTrId("txt_untrustedcert_dialog_accept_ood")
-            text = tr("'%1' has sent a certificate which is out of date. Accept anyway?");
-        }
-    } else {
-        bool isDateValid = mCertificateInfo->isDateValid();
-        bool isSiteValid = mCertificateInfo->commonNameMatches(mServerName);
-        if (!isDateValid && !isSiteValid) {
-            // TODO: hbTrId("txt_untrustedcert_dialog _accept_untrusted_site_ood"
-            text = tr("'%1' has sent an untrusted certificate with different site name and which is out of date. Accept anyway?");
-        } else if (!isSiteValid) {
-            // TODO: hbTrId("txt_untrustedcert_dialog _accept_untrusted_site"
-            text = tr("'%1' has sent an untrusted certificate with different site name. Accept anyway?");
-        } else if (!isDateValid) {
-            // TODO: hbTrId("txt_untrustedcert_dialog _accept_untrusted_ood")
-            text = tr("'%1' has sent an untrusted certificate which is out of date. Accept anyway?");
-        } else {
-            // TODO: hbTrId("txt_untrustedcert_dialog _accept_untrusted"
-            text = tr("'%1' has sent an untrusted certificate. Accept anyway?");
-        }
-    }
-    return text;
-}
-