diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-09-03 10:25:04 +0200 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-09-12 09:53:53 +0000 |
commit | 5b5b7d9a5f922ef5fa99cfac41da348e23970032 (patch) | |
tree | 52369f7ff008d64a6089a0d8063189f396761b99 /src/core/api/qwebengineurlscheme.h | |
parent | c91bba7af3215107916a135733dcf428f57a564f (diff) |
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>
Diffstat (limited to 'src/core/api/qwebengineurlscheme.h')
-rw-r--r-- | src/core/api/qwebengineurlscheme.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/core/api/qwebengineurlscheme.h b/src/core/api/qwebengineurlscheme.h index dd936bd9d..88a8f5065 100644 --- a/src/core/api/qwebengineurlscheme.h +++ b/src/core/api/qwebengineurlscheme.h @@ -43,6 +43,7 @@ #include <QtWebEngineCore/qtwebenginecoreglobal.h> #include <QtCore/qbytearray.h> +#include <QtCore/qobjectdefs.h> #include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE @@ -50,12 +51,13 @@ QT_BEGIN_NAMESPACE class QWebEngineUrlSchemePrivate; class QWEBENGINECORE_EXPORT QWebEngineUrlScheme { + Q_GADGET public: - enum Syntax { - HostPortAndUserInformationSyntax, - HostAndPortSyntax, - HostSyntax, - PathSyntax, + enum class Syntax { + HostPortAndUserInformation, + HostAndPort, + Host, + Path, }; enum SpecialPort { @@ -63,8 +65,8 @@ public: }; enum Flag { - Secure = 0x1, - Local = 0x2, + SecureScheme = 0x1, + LocalScheme = 0x2, LocalAccessAllowed = 0x4, NoAccessAllowed = 0x8, ServiceWorkersAllowed = 0x10, @@ -72,9 +74,10 @@ public: ContentSecurityPolicyIgnored = 0x40, }; Q_DECLARE_FLAGS(Flags, Flag) + Q_FLAG(Flags) QWebEngineUrlScheme(); - QWebEngineUrlScheme(const QByteArray &name); + explicit QWebEngineUrlScheme(const QByteArray &name); QWebEngineUrlScheme(const QWebEngineUrlScheme &that); QWebEngineUrlScheme &operator=(const QWebEngineUrlScheme &that); @@ -99,8 +102,8 @@ public: Flags flags() const; void setFlags(Flags newValue); - static void addScheme(const QWebEngineUrlScheme &scheme); - static QWebEngineUrlScheme findScheme(const QByteArray &name); + static void registerScheme(const QWebEngineUrlScheme &scheme); + static QWebEngineUrlScheme schemeByName(const QByteArray &name); private: QWebEngineUrlScheme(QWebEngineUrlSchemePrivate *d); |