diff options
| author | Richard Moore <rich@kde.org> | 2012-05-20 13:31:55 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-21 03:10:43 +0200 |
| commit | 0b8021f5cb64d751c694b976d09b0f89017b14e4 (patch) | |
| tree | d276c6e2207c0d78603bf5e4d6b00c9c0d17a6e5 /src/network/ssl/qsslcertificate_p.h | |
| parent | 1f109a864b66ec5e4a540f78b75ff9bdad8b249b (diff) | |
Change QSslCertificate::toText() to return a QString.
A couple of people reviewing the toText() method (which is new in 5.0)
have said that since the string returned is human readable it should
be a QString not a QByteArray. This change follows their advice.
Change-Id: Ibade9a24870805f7fbe2d299abeb9c6e964f0cf4
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/ssl/qsslcertificate_p.h')
| -rw-r--r-- | src/network/ssl/qsslcertificate_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h index cee0ebe9c0..12cea9b078 100644 --- a/src/network/ssl/qsslcertificate_p.h +++ b/src/network/ssl/qsslcertificate_p.h @@ -96,7 +96,7 @@ public: static QByteArray asn1ObjectId(ASN1_OBJECT *object); static QByteArray asn1ObjectName(ASN1_OBJECT *object); static QByteArray QByteArray_from_X509(X509 *x509, QSsl::EncodingFormat format); - static QByteArray text_from_X509(X509 *x509); + static QString text_from_X509(X509 *x509); static QSslCertificate QSslCertificate_from_X509(X509 *x509); static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1); static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1); |