diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-03-27 12:56:40 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-03-31 15:28:23 +0200 |
| commit | 3af596402aec91475a98c9f3da768721d107442e (patch) | |
| tree | 52ae6e08a71d74f34679b1dbc84fb5284d97d101 /src/network/ssl/qsslcertificate.h | |
| parent | 6a8132c8ee525426ffcdfdea80f8f53fd0bf10bb (diff) | |
Remove QRegExp usage from QSslCertificate and QSslSocket
Change-Id: I81abe1ab2173af922fa4b5fad58d25fa602c523b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslcertificate.h')
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 525642a809..b7d4f4fa3e 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -50,7 +50,6 @@ #include <QtCore/qbytearray.h> #include <QtCore/qcryptographichash.h> #include <QtCore/qdatetime.h> -#include <QtCore/qregexp.h> #include <QtCore/qsharedpointer.h> #include <QtCore/qmap.h> #include <QtNetwork/qssl.h> @@ -142,19 +141,9 @@ public: QByteArray toDer() const; QString toText() const; -#if QT_DEPRECATED_SINCE(5,15) - QT_DEPRECATED_X("Use the overload not using QRegExp") static QList<QSslCertificate> fromPath( - const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - QRegExp::PatternSyntax syntax = QRegExp::FixedString); - - static QList<QSslCertificate> fromPath( - const QString &path, QSsl::EncodingFormat format, - PatternSyntax syntax); -#else static QList<QSslCertificate> fromPath( const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - PatternSyntax syntax = FixedString); -#endif + PatternSyntax syntax = PatternSyntax::FixedString); static QList<QSslCertificate> fromDevice( QIODevice *device, QSsl::EncodingFormat format = QSsl::Pem); |