diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-06-27 15:55:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-27 20:44:36 +0200 |
| commit | 9b46943686e1db475eb057c8955e931649cd2705 (patch) | |
| tree | 5011b43cf760f072358229c735a802e35f24b533 /examples/network/securesocketclient | |
| parent | 1cf971b99c85614edaccd86356700ad5de6837ea (diff) | |
SSL example: update secure socket client example to use new cert API
issuerInfo and subjectInfo now return a QStringList instead of a QString
Change-Id: I04174a7f6319ae156ac8de964d04c0525c9c5a9a
Reviewed-on: http://codereview.qt.nokia.com/799
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'examples/network/securesocketclient')
| -rw-r--r-- | examples/network/securesocketclient/certificateinfo.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/examples/network/securesocketclient/certificateinfo.cpp b/examples/network/securesocketclient/certificateinfo.cpp index b1a9acb0b2..9c9ffdeb4c 100644 --- a/examples/network/securesocketclient/certificateinfo.cpp +++ b/examples/network/securesocketclient/certificateinfo.cpp @@ -65,8 +65,8 @@ void CertificateInfo::setCertificateChain(const QList<QSslCertificate> &chain) for (int i = 0; i < chain.size(); ++i) { const QSslCertificate &cert = chain.at(i); form->certificationPathView->addItem(tr("%1%2 (%3)").arg(!i ? QString() : tr("Issued by: ")) - .arg(cert.subjectInfo(QSslCertificate::Organization)) - .arg(cert.subjectInfo(QSslCertificate::CommonName))); + .arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" "))) + .arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" ")))); } form->certificationPathView->setCurrentIndex(0); @@ -78,19 +78,19 @@ void CertificateInfo::updateCertificateInfo(int index) if (index >= 0 && index < chain.size()) { const QSslCertificate &cert = chain.at(index); QStringList lines; - lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization)) - << tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName)) - << tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName)) - << tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName)) - << tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName)) - << tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName)) + lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" "))) + << tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" "))) + << tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName).join(QLatin1String(" "))) + << tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName).join(QLatin1String(" "))) + << tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" "))) + << tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" "))) << QString() - << tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization)) - << tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName)) - << tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName)) - << tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName)) - << tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName)) - << tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName)); + << tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization).join(QLatin1String(" "))) + << tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" "))) + << tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName).join(QLatin1String(" "))) + << tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName).join(QLatin1String(" "))) + << tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" "))) + << tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName).join(QLatin1String(" "))); foreach (QString line, lines) form->certificateInfoView->addItem(line); } else { |