summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-07-23 10:39:32 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-19 08:09:05 +0000
commit9907b78f249b99b6a4eff4497bc058f4921ec5df (patch)
tree4705d973b75d853733d6e8c81a40d513503f9a5a /src
parent7ce45da66831d8f003860630d52ea53809a45df7 (diff)
Clean up coding style in API header files
Change-Id: Ifa5892415a1e0b8ce9b6bfa10719aba618e3b799 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit c9795481c6162f4e7800aa573c37e8a200b46782) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/core/api/qwebenginecertificateerror.h5
-rw-r--r--src/core/api/qwebengineclientcertificateselection.h3
-rw-r--r--src/core/api/qwebengineclientcertificatestore.h3
-rw-r--r--src/core/api/qwebenginecontextmenurequest.h4
-rw-r--r--src/core/api/qwebenginecookiestore.h3
-rw-r--r--src/core/api/qwebenginecookiestore_p.h3
-rw-r--r--src/core/api/qwebenginedownloadrequest_p.h4
-rw-r--r--src/core/api/qwebenginefindtextresult.h3
-rw-r--r--src/core/api/qwebenginehistory.h4
-rw-r--r--src/core/api/qwebenginehttprequest.h3
-rw-r--r--src/core/api/qwebengineloadinginfo.h6
-rw-r--r--src/core/api/qwebenginemessagepumpscheduler_p.h3
-rw-r--r--src/core/api/qwebenginenavigationrequest.h3
-rw-r--r--src/core/api/qwebenginenotification.h3
-rw-r--r--src/core/api/qwebenginepage.h21
-rw-r--r--src/core/api/qwebenginepage_p.h20
-rw-r--r--src/core/api/qwebengineprofile.h5
-rw-r--r--src/core/api/qwebengineprofile_p.h4
-rw-r--r--src/core/api/qwebenginequotarequest.h3
-rw-r--r--src/core/api/qwebengineregisterprotocolhandlerrequest.h3
-rw-r--r--src/core/api/qwebenginescript.h3
-rw-r--r--src/core/api/qwebenginescriptcollection.h3
-rw-r--r--src/core/api/qwebenginescriptcollection_p.h3
-rw-r--r--src/core/api/qwebenginesettings.h3
-rw-r--r--src/core/api/qwebengineurlrequestinfo.h3
-rw-r--r--src/core/api/qwebengineurlrequestinfo_p.h3
-rw-r--r--src/core/api/qwebengineurlrequestinterceptor.h3
-rw-r--r--src/core/api/qwebengineurlrequestjob.h3
-rw-r--r--src/core/api/qwebengineurlscheme.h3
-rw-r--r--src/core/api/qwebengineurlschemehandler.h3
-rw-r--r--src/webenginewidgets/api/qwebenginenotificationpresenter_p.h3
-rw-r--r--src/webenginewidgets/api/qwebengineview.h42
-rw-r--r--src/webenginewidgets/api/qwebengineview_p.h2
33 files changed, 110 insertions, 73 deletions
diff --git a/src/core/api/qwebenginecertificateerror.h b/src/core/api/qwebenginecertificateerror.h
index d448303ce..82ef5017a 100644
--- a/src/core/api/qwebenginecertificateerror.h
+++ b/src/core/api/qwebenginecertificateerror.h
@@ -53,7 +53,8 @@ class CertificateErrorController;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_EXPORT QWebEngineCertificateError {
+class Q_WEBENGINECORE_EXPORT QWebEngineCertificateError
+{
Q_GADGET
Q_PROPERTY(QUrl url READ url CONSTANT FINAL)
Q_PROPERTY(Type type READ type CONSTANT FINAL)
@@ -62,7 +63,7 @@ class Q_WEBENGINECORE_EXPORT QWebEngineCertificateError {
public:
QWebEngineCertificateError(const QWebEngineCertificateError &other);
- QWebEngineCertificateError& operator=(const QWebEngineCertificateError &other);
+ QWebEngineCertificateError &operator=(const QWebEngineCertificateError &other);
~QWebEngineCertificateError();
// Keep this identical to NET_ERROR in net_error_list.h, or add mapping layer.
diff --git a/src/core/api/qwebengineclientcertificateselection.h b/src/core/api/qwebengineclientcertificateselection.h
index 81c626f73..71c85f154 100644
--- a/src/core/api/qwebengineclientcertificateselection.h
+++ b/src/core/api/qwebengineclientcertificateselection.h
@@ -52,7 +52,8 @@ class ClientCertSelectController;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_EXPORT QWebEngineClientCertificateSelection {
+class Q_WEBENGINECORE_EXPORT QWebEngineClientCertificateSelection
+{
public:
QWebEngineClientCertificateSelection(const QWebEngineClientCertificateSelection &);
~QWebEngineClientCertificateSelection();
diff --git a/src/core/api/qwebengineclientcertificatestore.h b/src/core/api/qwebengineclientcertificatestore.h
index a9282f0fb..12ac9c6be 100644
--- a/src/core/api/qwebengineclientcertificatestore.h
+++ b/src/core/api/qwebengineclientcertificatestore.h
@@ -55,7 +55,8 @@ class ProfileAdapter;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_EXPORT QWebEngineClientCertificateStore {
+class Q_WEBENGINECORE_EXPORT QWebEngineClientCertificateStore
+{
public:
void add(const QSslCertificate &certificate, const QSslKey &privateKey);
diff --git a/src/core/api/qwebenginecontextmenurequest.h b/src/core/api/qwebenginecontextmenurequest.h
index f075dd060..a5911463a 100644
--- a/src/core/api/qwebenginecontextmenurequest.h
+++ b/src/core/api/qwebenginecontextmenurequest.h
@@ -129,8 +129,8 @@ public:
Q_PROPERTY(QString misspelledWord READ misspelledWord CONSTANT FINAL)
Q_PROPERTY(QStringList spellCheckerSuggestions READ spellCheckerSuggestions CONSTANT FINAL)
Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted FINAL)
- Q_PROPERTY(MediaFlags mediaFlags READ mediaFlags CONSTANT FINAL REVISION(1,1))
- Q_PROPERTY(EditFlags editFlags READ editFlags CONSTANT FINAL REVISION(1,1))
+ Q_PROPERTY(MediaFlags mediaFlags READ mediaFlags CONSTANT FINAL REVISION(1, 1))
+ Q_PROPERTY(EditFlags editFlags READ editFlags CONSTANT FINAL REVISION(1, 1))
virtual ~QWebEngineContextMenuRequest();
QPoint position() const;
diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h
index 584275ac4..e73222bcd 100644
--- a/src/core/api/qwebenginecookiestore.h
+++ b/src/core/api/qwebenginecookiestore.h
@@ -58,7 +58,8 @@ class ProfileAdapter;
QT_BEGIN_NAMESPACE
class QWebEngineCookieStorePrivate;
-class Q_WEBENGINECORE_EXPORT QWebEngineCookieStore : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineCookieStore : public QObject
+{
Q_OBJECT
public:
diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h
index 1a238ea87..9f26604a6 100644
--- a/src/core/api/qwebenginecookiestore_p.h
+++ b/src/core/api/qwebenginecookiestore_p.h
@@ -65,7 +65,8 @@ class CookieMonsterDelegateQt;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate {
+class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate
+{
Q_DECLARE_PUBLIC(QWebEngineCookieStore)
struct CookieData {
bool wasDelete;
diff --git a/src/core/api/qwebenginedownloadrequest_p.h b/src/core/api/qwebenginedownloadrequest_p.h
index 49980dbb8..e158d8edd 100644
--- a/src/core/api/qwebenginedownloadrequest_p.h
+++ b/src/core/api/qwebenginedownloadrequest_p.h
@@ -64,7 +64,8 @@ class WebContentsAdapterClient;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineDownloadRequestPrivate {
+class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineDownloadRequestPrivate
+{
public:
QWebEngineDownloadRequestPrivate(QtWebEngineCore::ProfileAdapter *adapter, const QUrl &url);
~QWebEngineDownloadRequestPrivate();
@@ -98,4 +99,3 @@ public:
QT_END_NAMESPACE
#endif // QWEBENGINEDOWNLOADREQUEST_P_H
-
diff --git a/src/core/api/qwebenginefindtextresult.h b/src/core/api/qwebenginefindtextresult.h
index c4849061a..8576dbabb 100644
--- a/src/core/api/qwebenginefindtextresult.h
+++ b/src/core/api/qwebenginefindtextresult.h
@@ -52,7 +52,8 @@ QT_BEGIN_NAMESPACE
class QWebEngineFindTextResultPrivate;
-class Q_WEBENGINECORE_EXPORT QWebEngineFindTextResult {
+class Q_WEBENGINECORE_EXPORT QWebEngineFindTextResult
+{
Q_GADGET
Q_PROPERTY(int numberOfMatches READ numberOfMatches CONSTANT FINAL)
Q_PROPERTY(int activeMatch READ activeMatch CONSTANT FINAL)
diff --git a/src/core/api/qwebenginehistory.h b/src/core/api/qwebenginehistory.h
index 96b257e67..6afb8d8c1 100644
--- a/src/core/api/qwebenginehistory.h
+++ b/src/core/api/qwebenginehistory.h
@@ -98,8 +98,8 @@ public:
IconUrlRole,
};
- int rowCount(const QModelIndex& parent = QModelIndex()) const override;
- QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QHash<int, QByteArray> roleNames() const override;
void reset();
diff --git a/src/core/api/qwebenginehttprequest.h b/src/core/api/qwebenginehttprequest.h
index e08520889..b302217f2 100644
--- a/src/core/api/qwebenginehttprequest.h
+++ b/src/core/api/qwebenginehttprequest.h
@@ -51,7 +51,8 @@ QT_BEGIN_NAMESPACE
class QWebEngineHttpRequestPrivate;
-class Q_WEBENGINECORE_EXPORT QWebEngineHttpRequest {
+class Q_WEBENGINECORE_EXPORT QWebEngineHttpRequest
+{
public:
enum Method {
Get,
diff --git a/src/core/api/qwebengineloadinginfo.h b/src/core/api/qwebengineloadinginfo.h
index d696fd595..b37dea609 100644
--- a/src/core/api/qwebengineloadinginfo.h
+++ b/src/core/api/qwebengineloadinginfo.h
@@ -96,9 +96,9 @@ public:
int errorCode() const;
private:
- QWebEngineLoadingInfo(const QUrl& url, LoadStatus status,
- bool isErrorPage = false, const QString& errorString = QString(),
- int errorCode = 0, ErrorDomain errorDomain = NoErrorDomain);
+ QWebEngineLoadingInfo(const QUrl &url, LoadStatus status, bool isErrorPage = false,
+ const QString &errorString = QString(), int errorCode = 0,
+ ErrorDomain errorDomain = NoErrorDomain);
class QWebEngineLoadingInfoPrivate;
Q_DECLARE_PRIVATE(QWebEngineLoadingInfo)
QExplicitlySharedDataPointer<QWebEngineLoadingInfoPrivate> d_ptr;
diff --git a/src/core/api/qwebenginemessagepumpscheduler_p.h b/src/core/api/qwebenginemessagepumpscheduler_p.h
index 07b2ca203..46ed62f54 100644
--- a/src/core/api/qwebenginemessagepumpscheduler_p.h
+++ b/src/core/api/qwebenginemessagepumpscheduler_p.h
@@ -59,7 +59,8 @@
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineMessagePumpScheduler : public QObject {
+class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineMessagePumpScheduler : public QObject
+{
Q_OBJECT
public:
QWebEngineMessagePumpScheduler(std::function<void()> callback);
diff --git a/src/core/api/qwebenginenavigationrequest.h b/src/core/api/qwebenginenavigationrequest.h
index f5136b154..ab098b6aa 100644
--- a/src/core/api/qwebenginenavigationrequest.h
+++ b/src/core/api/qwebenginenavigationrequest.h
@@ -96,7 +96,8 @@ Q_SIGNALS:
#endif
private:
- QWebEngineNavigationRequest(const QUrl& url, NavigationType navigationType, bool mainFrame, QObject *parent = nullptr);
+ QWebEngineNavigationRequest(const QUrl &url, NavigationType navigationType, bool mainFrame,
+ QObject *parent = nullptr);
friend class QWebEnginePagePrivate;
friend class QQuickWebEngineViewPrivate;
diff --git a/src/core/api/qwebenginenotification.h b/src/core/api/qwebenginenotification.h
index cd0fe0c67..791f6bb1b 100644
--- a/src/core/api/qwebenginenotification.h
+++ b/src/core/api/qwebenginenotification.h
@@ -55,7 +55,8 @@ QT_BEGIN_NAMESPACE
class QWebEngineNotificationPrivate;
-class Q_WEBENGINECORE_EXPORT QWebEngineNotification : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineNotification : public QObject
+{
Q_OBJECT
Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
Q_PROPERTY(QString title READ title CONSTANT FINAL)
diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h
index 9f35cffeb..fcff3ab1e 100644
--- a/src/core/api/qwebenginepage.h
+++ b/src/core/api/qwebenginepage.h
@@ -75,7 +75,8 @@ class QWebEngineScriptCollection;
class QWebEngineSettings;
class QWebEngineUrlRequestInterceptor;
-class Q_WEBENGINECORE_EXPORT QWebEnginePage : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEnginePage : public QObject
+{
Q_OBJECT
Q_PROPERTY(QString selectedText READ selectedText)
Q_PROPERTY(bool hasSelection READ hasSelection)
@@ -335,7 +336,7 @@ Q_SIGNALS:
void linkHovered(const QString &url);
void selectionChanged();
- void geometryChangeRequested(const QRect& geom);
+ void geometryChangeRequested(const QRect &geom);
void windowCloseRequested();
void featurePermissionRequested(const QUrl &securityOrigin, QWebEnginePage::Feature feature);
@@ -379,11 +380,15 @@ Q_SIGNALS:
protected:
virtual QWebEnginePage *createWindow(WebWindowType type);
- virtual QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes);
- virtual void javaScriptAlert(const QUrl &securityOrigin, const QString& msg);
- virtual bool javaScriptConfirm(const QUrl &securityOrigin, const QString& msg);
- virtual bool javaScriptPrompt(const QUrl &securityOrigin, const QString& msg, const QString& defaultValue, QString* result);
- virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID);
+ virtual QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles,
+ const QStringList &acceptedMimeTypes);
+ virtual void javaScriptAlert(const QUrl &securityOrigin, const QString &msg);
+ virtual bool javaScriptConfirm(const QUrl &securityOrigin, const QString &msg);
+ virtual bool javaScriptPrompt(const QUrl &securityOrigin, const QString &msg,
+ const QString &defaultValue, QString *result);
+ virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level,
+ const QString &message, int lineNumber,
+ const QString &sourceID);
virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame);
private:
@@ -405,7 +410,7 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QWebEnginePage::FindFlags)
Q_WEBENGINECORE_EXPORT QDataStream &operator<<(QDataStream &stream,
- const QWebEngineHistory &history);
+ const QWebEngineHistory &history);
Q_WEBENGINECORE_EXPORT QDataStream &operator>>(QDataStream &stream, QWebEngineHistory &history);
QT_END_NAMESPACE
diff --git a/src/core/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h
index 40b6ddd29..b406382b9 100644
--- a/src/core/api/qwebenginepage_p.h
+++ b/src/core/api/qwebenginepage_p.h
@@ -123,11 +123,11 @@ public:
void lifecycleStateChanged(LifecycleState state) override;
void recommendedStateChanged(LifecycleState state) override;
void visibleChanged(bool visible) override;
- void titleChanged(const QString&) override;
+ void titleChanged(const QString &) override;
void urlChanged() override;
- void iconChanged(const QUrl&) override;
+ void iconChanged(const QUrl &) override;
void loadProgressChanged(int progress) override;
- void didUpdateTargetURL(const QUrl&) override;
+ void didUpdateTargetURL(const QUrl &) override;
void selectionChanged() override;
void recentlyAudibleChanged(bool recentlyAudible) override;
void renderProcessPidChanged(qint64 pid) override;
@@ -152,14 +152,16 @@ public:
void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) override;
void runFileChooser(QSharedPointer<QtWebEngineCore::FilePickerController>) override;
void showColorDialog(QSharedPointer<QtWebEngineCore::ColorChooserController>) override;
- void didRunJavaScript(quint64 requestId, const QVariant& result) override;
- void didFetchDocumentMarkup(quint64 requestId, const QString& result) override;
- void didFetchDocumentInnerText(quint64 requestId, const QString& result) override;
+ void didRunJavaScript(quint64 requestId, const QVariant &result) override;
+ void didFetchDocumentMarkup(quint64 requestId, const QString &result) override;
+ void didFetchDocumentInnerText(quint64 requestId, const QString &result) override;
void didPrintPage(quint64 requestId, QSharedPointer<QByteArray> result) override;
void didPrintPageToPdf(const QString &filePath, bool success) override;
bool passOnFocus(bool reverse) override;
- void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID) override;
- void authenticationRequired(QSharedPointer<QtWebEngineCore::AuthenticationDialogController>) override;
+ void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message,
+ int lineNumber, const QString &sourceID) override;
+ void authenticationRequired(
+ QSharedPointer<QtWebEngineCore::AuthenticationDialogController>) override;
void releaseProfile() override;
void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) override;
void runFeaturePermissionRequest(QtWebEngineCore::ProfileAdapter::PermissionType permission, const QUrl &securityOrigin) override;
@@ -229,7 +231,7 @@ public:
mutable QMap<quint64, std::function<void(const QVariant &)>> m_variantCallbacks;
mutable QMap<quint64, std::function<void(const QString &)>> m_stringCallbacks;
- QMap<quint64, std::function<void(const QByteArray&)>> m_pdfResultCallbacks;
+ QMap<quint64, std::function<void(const QByteArray &)>> m_pdfResultCallbacks;
mutable QAction *actions[QWebEnginePage::WebActionCount];
};
diff --git a/src/core/api/qwebengineprofile.h b/src/core/api/qwebengineprofile.h
index 84e37b322..5e8deb216 100644
--- a/src/core/api/qwebengineprofile.h
+++ b/src/core/api/qwebengineprofile.h
@@ -62,7 +62,8 @@ class QWebEngineScriptCollection;
class QWebEngineUrlRequestInterceptor;
class QWebEngineUrlSchemeHandler;
-class Q_WEBENGINECORE_EXPORT QWebEngineProfile : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineProfile : public QObject
+{
Q_OBJECT
public:
explicit QWebEngineProfile(QObject *parent = nullptr);
@@ -107,7 +108,7 @@ public:
int httpCacheMaximumSize() const;
void setHttpCacheMaximumSize(int maxSize);
- QWebEngineCookieStore* cookieStore();
+ QWebEngineCookieStore *cookieStore();
void setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor);
void clearAllVisitedLinks();
diff --git a/src/core/api/qwebengineprofile_p.h b/src/core/api/qwebengineprofile_p.h
index f39862214..396c8b9bf 100644
--- a/src/core/api/qwebengineprofile_p.h
+++ b/src/core/api/qwebengineprofile_p.h
@@ -77,7 +77,7 @@ public:
QWebEngineProfilePrivate(QtWebEngineCore::ProfileAdapter *profileAdapter);
~QWebEngineProfilePrivate();
- QtWebEngineCore::ProfileAdapter* profileAdapter() const;
+ QtWebEngineCore::ProfileAdapter *profileAdapter() const;
QWebEngineSettings *settings() const { return m_settings; }
void downloadDestroyed(quint32 downloadId);
@@ -97,7 +97,7 @@ private:
QWebEngineSettings *m_settings;
QPointer<QtWebEngineCore::ProfileAdapter> m_profileAdapter;
QScopedPointer<QWebEngineScriptCollection> m_scriptCollection;
- QMap<quint32, QPointer<QWebEngineDownloadRequest> > m_ongoingDownloads;
+ QMap<quint32, QPointer<QWebEngineDownloadRequest>> m_ongoingDownloads;
std::function<void(std::unique_ptr<QWebEngineNotification>)> m_notificationPresenter;
};
diff --git a/src/core/api/qwebenginequotarequest.h b/src/core/api/qwebenginequotarequest.h
index 930a13f01..599ca8963 100644
--- a/src/core/api/qwebenginequotarequest.h
+++ b/src/core/api/qwebenginequotarequest.h
@@ -52,7 +52,8 @@ class QuotaRequestController;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_EXPORT QWebEngineQuotaRequest {
+class Q_WEBENGINECORE_EXPORT QWebEngineQuotaRequest
+{
Q_GADGET
Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL)
diff --git a/src/core/api/qwebengineregisterprotocolhandlerrequest.h b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
index b83827c92..86eb37404 100644
--- a/src/core/api/qwebengineregisterprotocolhandlerrequest.h
+++ b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
@@ -52,7 +52,8 @@ class WebContentsDelegateQt;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_EXPORT QWebEngineRegisterProtocolHandlerRequest {
+class Q_WEBENGINECORE_EXPORT QWebEngineRegisterProtocolHandlerRequest
+{
Q_GADGET
Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
Q_PROPERTY(QString scheme READ scheme CONSTANT FINAL)
diff --git a/src/core/api/qwebenginescript.h b/src/core/api/qwebenginescript.h
index b3768c103..a9b1bb869 100644
--- a/src/core/api/qwebenginescript.h
+++ b/src/core/api/qwebenginescript.h
@@ -51,7 +51,8 @@ class UserScript;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_EXPORT QWebEngineScript {
+class Q_WEBENGINECORE_EXPORT QWebEngineScript
+{
Q_GADGET
Q_PROPERTY(QString name READ name WRITE setName FINAL)
diff --git a/src/core/api/qwebenginescriptcollection.h b/src/core/api/qwebenginescriptcollection.h
index 40ac59e62..7bc9005cb 100644
--- a/src/core/api/qwebenginescriptcollection.h
+++ b/src/core/api/qwebenginescriptcollection.h
@@ -48,7 +48,8 @@
QT_BEGIN_NAMESPACE
class QWebEngineScriptCollectionPrivate;
-class Q_WEBENGINECORE_EXPORT QWebEngineScriptCollection {
+class Q_WEBENGINECORE_EXPORT QWebEngineScriptCollection
+{
public:
~QWebEngineScriptCollection();
diff --git a/src/core/api/qwebenginescriptcollection_p.h b/src/core/api/qwebenginescriptcollection_p.h
index 14bb6dab0..62444c78f 100644
--- a/src/core/api/qwebenginescriptcollection_p.h
+++ b/src/core/api/qwebenginescriptcollection_p.h
@@ -63,7 +63,8 @@ class UserResourceControllerHost;
} // namespace
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineScriptCollectionPrivate {
+class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineScriptCollectionPrivate
+{
public:
QWebEngineScriptCollectionPrivate(QtWebEngineCore::UserResourceControllerHost *, QSharedPointer<QtWebEngineCore::WebContentsAdapter> = QSharedPointer<QtWebEngineCore::WebContentsAdapter>());
int count() const;
diff --git a/src/core/api/qwebenginesettings.h b/src/core/api/qwebenginesettings.h
index 4ab364d1b..cb199d700 100644
--- a/src/core/api/qwebenginesettings.h
+++ b/src/core/api/qwebenginesettings.h
@@ -50,7 +50,8 @@ class WebEngineSettings;
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_EXPORT QWebEngineSettings {
+class Q_WEBENGINECORE_EXPORT QWebEngineSettings
+{
public:
enum FontFamily {
StandardFont,
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index 7c12f1861..658386632 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -53,7 +53,8 @@ QT_BEGIN_NAMESPACE
class QWebEngineUrlRequestInfoPrivate;
-class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestInfo {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestInfo
+{
public:
enum ResourceType {
ResourceTypeMainFrame = 0, // top level page
diff --git a/src/core/api/qwebengineurlrequestinfo_p.h b/src/core/api/qwebengineurlrequestinfo_p.h
index 206104ec9..05a89c5cf 100644
--- a/src/core/api/qwebengineurlrequestinfo_p.h
+++ b/src/core/api/qwebengineurlrequestinfo_p.h
@@ -65,7 +65,8 @@ class URLRequest;
QT_BEGIN_NAMESPACE
-class QWebEngineUrlRequestInfoPrivate {
+class QWebEngineUrlRequestInfoPrivate
+{
Q_DECLARE_PUBLIC(QWebEngineUrlRequestInfo)
public:
QWebEngineUrlRequestInfoPrivate(QWebEngineUrlRequestInfo::ResourceType resource,
diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h
index 6903a25ff..a96ded1a3 100644
--- a/src/core/api/qwebengineurlrequestinterceptor.h
+++ b/src/core/api/qwebengineurlrequestinterceptor.h
@@ -47,7 +47,8 @@
QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestInterceptor : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestInterceptor : public QObject
+{
Q_OBJECT
Q_DISABLE_COPY(QWebEngineUrlRequestInterceptor)
public:
diff --git a/src/core/api/qwebengineurlrequestjob.h b/src/core/api/qwebengineurlrequestjob.h
index 6d4a9e734..c7128fd3c 100644
--- a/src/core/api/qwebengineurlrequestjob.h
+++ b/src/core/api/qwebengineurlrequestjob.h
@@ -55,7 +55,8 @@ QT_BEGIN_NAMESPACE
class QIODevice;
-class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestJob : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestJob : public QObject
+{
Q_OBJECT
public:
~QWebEngineUrlRequestJob();
diff --git a/src/core/api/qwebengineurlscheme.h b/src/core/api/qwebengineurlscheme.h
index ecac44184..e934f39d5 100644
--- a/src/core/api/qwebengineurlscheme.h
+++ b/src/core/api/qwebengineurlscheme.h
@@ -54,7 +54,8 @@ QT_BEGIN_NAMESPACE
class QWebEngineUrlSchemePrivate;
-class Q_WEBENGINECORE_EXPORT QWebEngineUrlScheme {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlScheme
+{
Q_GADGET
public:
enum class Syntax {
diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h
index 91ee21695..c1625d9d7 100644
--- a/src/core/api/qwebengineurlschemehandler.h
+++ b/src/core/api/qwebengineurlschemehandler.h
@@ -48,7 +48,8 @@ QT_BEGIN_NAMESPACE
class QWebEngineUrlRequestJob;
-class Q_WEBENGINECORE_EXPORT QWebEngineUrlSchemeHandler : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlSchemeHandler : public QObject
+{
Q_OBJECT
public:
QWebEngineUrlSchemeHandler(QObject *parent = nullptr);
diff --git a/src/webenginewidgets/api/qwebenginenotificationpresenter_p.h b/src/webenginewidgets/api/qwebenginenotificationpresenter_p.h
index 49d774806..33b6a6782 100644
--- a/src/webenginewidgets/api/qwebenginenotificationpresenter_p.h
+++ b/src/webenginewidgets/api/qwebenginenotificationpresenter_p.h
@@ -62,7 +62,8 @@ QT_BEGIN_NAMESPACE
class QSystemTrayIcon;
-class DefaultNotificationPresenter : public QObject {
+class DefaultNotificationPresenter : public QObject
+{
Q_OBJECT
public:
DefaultNotificationPresenter(QObject *parent = nullptr);
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index edd619621..b222de0df 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -59,7 +59,8 @@ class QWebEngineSettings;
class QWebEngineViewAccessible;
class QWebEngineViewPrivate;
-class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
+class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget
+{
Q_OBJECT
Q_PROPERTY(QString title READ title)
Q_PROPERTY(QUrl url READ url WRITE setUrl)
@@ -75,15 +76,16 @@ public:
static QWebEngineView *forPage(const QWebEnginePage *page);
- QWebEnginePage* page() const;
- void setPage(QWebEnginePage* page);
+ QWebEnginePage *page() const;
+ void setPage(QWebEnginePage *page);
void load(const QUrl &url);
void load(const QWebEngineHttpRequest &request);
- void setHtml(const QString& html, const QUrl& baseUrl = QUrl());
- void setContent(const QByteArray& data, const QString& mimeType = QString(), const QUrl& baseUrl = QUrl());
+ void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
+ void setContent(const QByteArray &data, const QString &mimeType = QString(),
+ const QUrl &baseUrl = QUrl());
- QWebEngineHistory* history() const;
+ QWebEngineHistory *history() const;
QString title() const;
void setUrl(const QUrl &url);
@@ -95,13 +97,15 @@ public:
QString selectedText() const;
#ifndef QT_NO_ACTION
- QAction* pageAction(QWebEnginePage::WebAction action) const;
+ QAction *pageAction(QWebEnginePage::WebAction action) const;
#endif
void triggerPageAction(QWebEnginePage::WebAction action, bool checked = false);
qreal zoomFactor() const;
void setZoomFactor(qreal factor);
- void findText(const QString &subString, QWebEnginePage::FindFlags options = {}, const std::function<void(const QWebEngineFindTextResult &)> &resultCallback = std::function<void(const QWebEngineFindTextResult &)>());
+ void findText(const QString &subString, QWebEnginePage::FindFlags options = {},
+ const std::function<void(const QWebEngineFindTextResult &)> &resultCallback =
+ std::function<void(const QWebEngineFindTextResult &)>());
QSize sizeHint() const override;
QWebEngineSettings *settings() const;
@@ -112,10 +116,12 @@ public:
QWebEngineContextMenuRequest *lastContextMenuRequest() const;
void printToPdf(const QString &filePath,
- const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()),
+ const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4),
+ QPageLayout::Portrait, QMarginsF()),
const QPageRanges &ranges = {});
- void printToPdf(const std::function<void(const QByteArray&)> &resultCallback,
- const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()),
+ void printToPdf(const std::function<void(const QByteArray &)> &resultCallback,
+ const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4),
+ QPageLayout::Portrait, QMarginsF()),
const QPageRanges &ranges = {});
void print(QPrinter *printer);
@@ -129,13 +135,13 @@ Q_SIGNALS:
void loadStarted();
void loadProgress(int progress);
void loadFinished(bool);
- void titleChanged(const QString& title);
+ void titleChanged(const QString &title);
void selectionChanged();
- void urlChanged(const QUrl&);
- void iconUrlChanged(const QUrl&);
- void iconChanged(const QIcon&);
+ void urlChanged(const QUrl &);
+ void iconUrlChanged(const QUrl &);
+ void iconChanged(const QIcon &);
void renderProcessTerminated(QWebEnginePage::RenderProcessTerminationStatus terminationStatus,
- int exitCode);
+ int exitCode);
void pdfPrintingFinished(const QString &filePath, bool success);
void printRequested();
void printFinished(bool success);
@@ -143,9 +149,9 @@ Q_SIGNALS:
protected:
virtual QWebEngineView *createWindow(QWebEnginePage::WebWindowType type);
#if QT_CONFIG(contextmenu)
- void contextMenuEvent(QContextMenuEvent*) override;
+ void contextMenuEvent(QContextMenuEvent *) override;
#endif // QT_CONFIG(contextmenu)
- bool event(QEvent*) override;
+ bool event(QEvent *) override;
void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;
void closeEvent(QCloseEvent *) override;
diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h
index 13b346df9..c34aec09a 100644
--- a/src/webenginewidgets/api/qwebengineview_p.h
+++ b/src/webenginewidgets/api/qwebengineview_p.h
@@ -130,7 +130,7 @@ public:
int indexOfChild(const QAccessibleInterface *child) const override;
private:
- QWebEngineView *view() const { return static_cast<QWebEngineView*>(object()); }
+ QWebEngineView *view() const { return static_cast<QWebEngineView *>(object()); }
};
#endif // QT_NO_ACCESSIBILITY