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>

3 files changed, 8 insertions, 8 deletions

diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index ba07e7ef06..105cb4b323 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -820,10 +820,10 @@ QByteArray QSslCertificate::toDer() const
 
     \since 5.0
 */
-QByteArray QSslCertificate::toText() const
+QString QSslCertificate::toText() const
 {
     if (!d->x509)
-        return QByteArray();
+        return QString();
     return d->text_from_X509(d->x509);
 }
 
@@ -991,17 +991,17 @@ QByteArray QSslCertificatePrivate::QByteArray_from_X509(X509 *x509, QSsl::Encodi
     return BEGINCERTSTRING "\n" + tmp + ENDCERTSTRING "\n";
 }
 
-QByteArray QSslCertificatePrivate::text_from_X509(X509 *x509)
+QString QSslCertificatePrivate::text_from_X509(X509 *x509)
 {
     if (!x509) {
         qWarning("QSslSocketBackendPrivate::text_from_X509: null X509");
-        return QByteArray();
+        return QString();
     }
 
     QByteArray result;
     BIO *bio = q_BIO_new(q_BIO_s_mem());
     if (!bio)
-      return result;
+        return QString();
 
     q_X509_print(bio, x509);
 
@@ -1013,7 +1013,7 @@ QByteArray QSslCertificatePrivate::text_from_X509(X509 *x509)
 
     q_BIO_free(bio);
 
-    return result;
+    return QString::fromLatin1(result);
 }
 
 QByteArray QSslCertificatePrivate::asn1ObjectId(ASN1_OBJECT *object)
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index fbb38a9b46..ff86e95909 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -124,7 +124,7 @@ public:
 
     QByteArray toPem() const;
     QByteArray toDer() const;
-    QByteArray toText() const;
+    QString toText() const;
 
     static QList<QSslCertificate> fromPath(
         const QString &path, QSsl::EncodingFormat format = QSsl::Pem,
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);