Improve QWebEngineUrlScheme API

Following feedback from 5.12 API review:

- Use enum class for Syntax
- Add Q_FLAG for Flags
- Mark constructor from name as explicit
- Rename Secure to SecureScheme
- Rename Local to LocalScheme
- Rename addScheme to registerScheme
- Rename findScheme to schemeByName

Task-number: QTBUG-70247
Change-Id: Iae332c8d9843349506e8a4b07d70f0d234597375
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 19 insertions, 19 deletions

diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp
index 31d16adff..d867ff98d 100644
--- a/tests/auto/widgets/origins/tst_origins.cpp
+++ b/tests/auto/widgets/origins/tst_origins.cpp
@@ -51,76 +51,76 @@ void registerSchemes()
 {
     {
         QWebEngineUrlScheme scheme(QBAL("PathSyntax"));
-        QWebEngineUrlScheme::addScheme(scheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("PathSyntax-Secure"));
-        scheme.setFlags(QWebEngineUrlScheme::Secure);
-        QWebEngineUrlScheme::addScheme(scheme);
+        scheme.setFlags(QWebEngineUrlScheme::SecureScheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("PathSyntax-Secure-ServiceWorkersAllowed"));
-        scheme.setFlags(QWebEngineUrlScheme::Secure | QWebEngineUrlScheme::ServiceWorkersAllowed);
-        QWebEngineUrlScheme::addScheme(scheme);
+        scheme.setFlags(QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::ServiceWorkersAllowed);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("PathSyntax-Local"));
-        scheme.setFlags(QWebEngineUrlScheme::Local);
-        QWebEngineUrlScheme::addScheme(scheme);
+        scheme.setFlags(QWebEngineUrlScheme::LocalScheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("PathSyntax-LocalAccessAllowed"));
         scheme.setFlags(QWebEngineUrlScheme::LocalAccessAllowed);
-        QWebEngineUrlScheme::addScheme(scheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("PathSyntax-NoAccessAllowed"));
         scheme.setFlags(QWebEngineUrlScheme::NoAccessAllowed);
-        QWebEngineUrlScheme::addScheme(scheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("PathSyntax-ServiceWorkersAllowed"));
         scheme.setFlags(QWebEngineUrlScheme::ServiceWorkersAllowed);
-        QWebEngineUrlScheme::addScheme(scheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("PathSyntax-ViewSourceAllowed"));
         scheme.setFlags(QWebEngineUrlScheme::ViewSourceAllowed);
-        QWebEngineUrlScheme::addScheme(scheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("HostSyntax"));
-        scheme.setSyntax(QWebEngineUrlScheme::HostSyntax);
-        QWebEngineUrlScheme::addScheme(scheme);
+        scheme.setSyntax(QWebEngineUrlScheme::Syntax::Host);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("HostSyntax-ContentSecurityPolicyIgnored"));
-        scheme.setSyntax(QWebEngineUrlScheme::HostSyntax);
+        scheme.setSyntax(QWebEngineUrlScheme::Syntax::Host);
         scheme.setFlags(QWebEngineUrlScheme::ContentSecurityPolicyIgnored);
-        QWebEngineUrlScheme::addScheme(scheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("HostAndPortSyntax"));
-        scheme.setSyntax(QWebEngineUrlScheme::HostAndPortSyntax);
+        scheme.setSyntax(QWebEngineUrlScheme::Syntax::HostAndPort);
         scheme.setDefaultPort(42);
-        QWebEngineUrlScheme::addScheme(scheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 
     {
         QWebEngineUrlScheme scheme(QBAL("HostPortAndUserInformationSyntax"));
-        scheme.setSyntax(QWebEngineUrlScheme::HostPortAndUserInformationSyntax);
+        scheme.setSyntax(QWebEngineUrlScheme::Syntax::HostPortAndUserInformation);
         scheme.setDefaultPort(42);
-        QWebEngineUrlScheme::addScheme(scheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
     }
 }
 Q_CONSTRUCTOR_FUNCTION(registerSchemes)