From c9795481c6162f4e7800aa573c37e8a200b46782 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 23 Jul 2021 10:39:32 +0200 Subject: Clean up coding style in API header files Pick-to: 6.2 Change-Id: Ifa5892415a1e0b8ce9b6bfa10719aba618e3b799 Reviewed-by: Michal Klocek --- .../api/qwebenginenotificationpresenter_p.h | 3 +- src/webenginewidgets/api/qwebengineview.h | 42 ++++++++++++---------- src/webenginewidgets/api/qwebengineview_p.h | 2 +- 3 files changed, 27 insertions(+), 20 deletions(-) (limited to 'src/webenginewidgets/api') 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 &resultCallback = std::function()); + void findText(const QString &subString, QWebEnginePage::FindFlags options = {}, + const std::function &resultCallback = + std::function()); 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 &resultCallback, - const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()), + void printToPdf(const std::function &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(object()); } + QWebEngineView *view() const { return static_cast(object()); } }; #endif // QT_NO_ACCESSIBILITY -- cgit v1.2.3