diff options
author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-08-03 18:36:55 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 16:13:33 +0200 |
commit | 8ef86d05f199ebab216da43d5e0a9dc322b657b3 (patch) | |
tree | ea8fac9adf6ce41b530bdb2bc6f4b79010f871f9 /src/network/ssl/qsslcertificate.h | |
parent | 69d6012de469185aa70c86fec69fcb908acfde0c (diff) |
QSslCertificate: deprecate alternateSubjectNames()
... and add a new method subjectAlternativeNames() instead. This was
a typo in the API.
Change-Id: Id8704c387c9ff8e1af2b9a524ff628f5c053a294
Reviewed-on: http://codereview.qt.nokia.com/2618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/network/ssl/qsslcertificate.h')
-rw-r--r-- | src/network/ssl/qsslcertificate.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index a057d7a17d..0498d162c4 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -48,6 +48,7 @@ #include <QtCore/qcryptographichash.h> #include <QtCore/qregexp.h> #include <QtCore/qsharedpointer.h> +#include <QtCore/qmap.h> #include <QtNetwork/qssl.h> typedef struct x509_st X509; // ### check if this works @@ -65,7 +66,6 @@ class QIODevice; class QSslError; class QSslKey; class QStringList; -template <typename T, typename U> class QMultiMap; class QSslCertificatePrivate; class Q_NETWORK_EXPORT QSslCertificate @@ -106,7 +106,11 @@ public: QStringList subjectInfo(const QByteArray &attribute) const; QList<QByteArray> subjectInfoAttributes() const; QList<QByteArray> issuerInfoAttributes() const; - QMultiMap<QSsl::AlternateNameEntryType, QString> alternateSubjectNames() const; +#if QT_DEPRECATED_SINCE(5,0) + QT_DEPRECATED inline QMultiMap<QSsl::AlternateNameEntryType, QString> + alternateSubjectNames() const { return subjectAlternativeNames(); } +#endif + QMultiMap<QSsl::AlternativeNameEntryType, QString> subjectAlternativeNames() const; QDateTime effectiveDate() const; QDateTime expiryDate() const; QSslKey publicKey() const; |