From 813111689629a71e51d7d149a5f689b2961f2716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Tue, 25 Feb 2020 11:55:30 +0100
Subject: QSslCertificate: Turn enum into enum class and expand abbreviation

From API review

Change-Id: Id174ff1a0a123585e41723ef1c1876b2f3bd39c5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 src/network/ssl/qsslcertificate.cpp | 8 ++++----
 src/network/ssl/qsslcertificate.h   | 4 ++--
 src/network/ssl/qsslconfiguration.h | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/network/ssl')

diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index c179cf9c4a..791dc7852f 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -573,12 +573,12 @@ QList<QSslCertificate> QSslCertificate::fromPath(const QString &path,
     int pos = -1;
 
 #if QT_CONFIG(regularexpression)
-    if (syntax == Wildcard)
+    if (syntax == PatternSyntax::Wildcard)
         pos = pathPrefix.indexOf(QRegularExpression(QLatin1String("[*?[]")));
-    else if (syntax == RegExp)
+    else if (syntax == PatternSyntax::RegularExpression)
         pos = sourcePath.indexOf(QRegularExpression(QLatin1String("[\\$\\(\\)\\*\\+\\.\\?\\[\\]\\^\\{\\}\\|]")));
 #else
-    if (syntax == Wildcard || syntax == RegExp)
+    if (syntax == PatternSyntax::Wildcard || syntax == PatternSyntax::RegExp)
         qWarning("Regular expression support is disabled in this build. Only fixed string can be searched");
         return QList<QSslCertificate>();
 #endif
@@ -615,7 +615,7 @@ QList<QSslCertificate> QSslCertificate::fromPath(const QString &path,
     QList<QSslCertificate> certs;
 
 #if QT_CONFIG(regularexpression)
-    if (syntax == Wildcard)
+    if (syntax == PatternSyntax::Wildcard)
         sourcePath = QRegularExpression::wildcardToRegularExpression(sourcePath);
 
     QRegularExpression pattern(QRegularExpression::anchoredPattern(sourcePath));
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 9993769888..b98c5cfcab 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -84,8 +84,8 @@ public:
         EmailAddress
     };
 
-    enum PatternSyntax {
-        RegExp,
+    enum class PatternSyntax {
+        RegularExpression,
         Wildcard,
         FixedString
     };
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index 09616098a5..1c181121f4 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -131,8 +131,9 @@ public:
     // Certificate Authority (CA) settings
     QList<QSslCertificate> caCertificates() const;
     void setCaCertificates(const QList<QSslCertificate> &certificates);
-    bool addCaCertificates(const QString &path, QSsl::EncodingFormat format = QSsl::Pem,
-                           QSslCertificate::PatternSyntax syntax = QSslCertificate::FixedString);
+    bool addCaCertificates(
+            const QString &path, QSsl::EncodingFormat format = QSsl::Pem,
+            QSslCertificate::PatternSyntax syntax = QSslCertificate::PatternSyntax::FixedString);
     void addCaCertificate(const QSslCertificate &certificate);
     void addCaCertificates(const QList<QSslCertificate> &certificates);
 
-- 
cgit v1.2.3