From b984992fc92b6dd607732d6dad1c533b36f1ba3a Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 7 Jan 2018 23:28:42 +0100 Subject: Added .clang-format --- src/webengine/urlinterceptor.cpp | 4 +-- src/webengine/urlinterceptor.h | 3 +- src/webengine/webengineprofile.cpp | 72 +++++++++++++++++++------------------- src/webengine/webengineprofile.h | 2 +- src/webengine/webpage.cpp | 4 +-- src/webengine/webview.cpp | 14 ++++---- src/webengine/webview.h | 4 +-- 7 files changed, 51 insertions(+), 52 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/urlinterceptor.cpp b/src/webengine/urlinterceptor.cpp index b8d30cd..bb9bb5f 100644 --- a/src/webengine/urlinterceptor.cpp +++ b/src/webengine/urlinterceptor.cpp @@ -10,8 +10,8 @@ #include #include -UrlRequestInterceptor::UrlRequestInterceptor(const QString &path, QObject *parent) : - QWebEngineUrlRequestInterceptor(parent) +UrlRequestInterceptor::UrlRequestInterceptor(const QString &path, QObject *parent) + : QWebEngineUrlRequestInterceptor(parent) { #ifdef QT_DEBUG qDebug("Reading request blocklist: %s", qUtf8Printable(path)); diff --git a/src/webengine/urlinterceptor.h b/src/webengine/urlinterceptor.h index af0bf35..24936c3 100644 --- a/src/webengine/urlinterceptor.h +++ b/src/webengine/urlinterceptor.h @@ -15,7 +15,6 @@ class UrlRequestInterceptor : public QWebEngineUrlRequestInterceptor { Q_OBJECT public: - struct HostRule { bool isBlocking; }; @@ -29,7 +28,7 @@ public slots: int parseHostfile(const QString &filename); private: - QHash m_rules; + QHash m_rules; }; #endif // URLREQUESTINTERCEPTOR_H diff --git a/src/webengine/webengineprofile.cpp b/src/webengine/webengineprofile.cpp index 2d98b3d..78f0b9a 100644 --- a/src/webengine/webengineprofile.cpp +++ b/src/webengine/webengineprofile.cpp @@ -7,12 +7,12 @@ */ #include "webengineprofile.h" +#include #include #include -#include -WebEngineProfile::WebEngineProfile(QObject *parent) : - QWebEngineProfile(parent) +WebEngineProfile::WebEngineProfile(QObject *parent) + : QWebEngineProfile(parent) { m_name = tr("Off-the-record"); @@ -23,8 +23,8 @@ WebEngineProfile::WebEngineProfile(QObject *parent) : // Off-the-record profiles have no persistent path } -WebEngineProfile::WebEngineProfile(const QString &name, const QString &path, QObject *parent) : - QWebEngineProfile(name, parent) +WebEngineProfile::WebEngineProfile(const QString &name, const QString &path, QObject *parent) + : QWebEngineProfile(name, parent) { m_name = name; @@ -78,7 +78,7 @@ void WebEngineProfile::saveProfile() config.beginGroup("http"); config.setValue("userAgent", httpUserAgent()); config.setValue("accept-lang", httpAcceptLanguage()); - switch (httpCacheType()) { + switch(httpCacheType()) { case MemoryHttpCache: config.setValue("cacheType", "memory"); break; @@ -90,10 +90,10 @@ void WebEngineProfile::saveProfile() break; } config.setValue("cacheSize", httpCacheMaximumSize()); - config.endGroup(); // http + config.endGroup(); // http config.beginGroup("policy"); - switch (persistentCookiesPolicy()) { + switch(persistentCookiesPolicy()) { case NoPersistentCookies: config.setValue("cookies", "disabled"); break; @@ -104,7 +104,7 @@ void WebEngineProfile::saveProfile() config.setValue("cookies", "force"); break; } - config.endGroup(); // policy + config.endGroup(); // policy QWebEngineSettings *s = settings(); config.beginGroup("attributes"); @@ -133,7 +133,7 @@ void WebEngineProfile::saveProfile() config.setValue("printElementBackgrounds", s->testAttribute(QWebEngineSettings::PrintElementBackgrounds)); config.setValue("allowRunningInsecureContent", s->testAttribute(QWebEngineSettings::AllowRunningInsecureContent)); #endif - config.endGroup(); // attributes + config.endGroup(); // attributes config.sync(); } @@ -170,7 +170,7 @@ WebEngineProfile *createProfile(const QString &name, const QString &path, QObjec } } profile->setHttpCacheMaximumSize(config.value("cacheSize").toInt()); - config.endGroup(); // http + config.endGroup(); // http config.beginGroup("policy"); { @@ -183,59 +183,59 @@ WebEngineProfile *createProfile(const QString &name, const QString &path, QObjec profile->setPersistentCookiesPolicy(QWebEngineProfile::ForcePersistentCookies); } } - config.endGroup(); // policy + config.endGroup(); // policy config.beginGroup("attributes"); QWebEngineSettings *s = profile->settings(); s->setAttribute(QWebEngineSettings::AutoLoadImages, - config.value("autoLoadImages", s->testAttribute(QWebEngineSettings::AutoLoadImages)).toBool()); + config.value("autoLoadImages", s->testAttribute(QWebEngineSettings::AutoLoadImages)).toBool()); s->setAttribute(QWebEngineSettings::JavascriptEnabled, - config.value("javascriptEnabled", s->testAttribute(QWebEngineSettings::JavascriptEnabled)).toBool()); + config.value("javascriptEnabled", s->testAttribute(QWebEngineSettings::JavascriptEnabled)).toBool()); s->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, - config.value("javascriptCanOpenWindows", s->testAttribute(QWebEngineSettings::JavascriptCanOpenWindows)).toBool()); + config.value("javascriptCanOpenWindows", s->testAttribute(QWebEngineSettings::JavascriptCanOpenWindows)).toBool()); s->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, - config.value("javascriptCanAccessClipboard", s->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)).toBool()); + config.value("javascriptCanAccessClipboard", s->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)).toBool()); s->setAttribute(QWebEngineSettings::LinksIncludedInFocusChain, - config.value("linksIncludedInFocusChain", s->testAttribute(QWebEngineSettings::LinksIncludedInFocusChain)).toBool()); + config.value("linksIncludedInFocusChain", s->testAttribute(QWebEngineSettings::LinksIncludedInFocusChain)).toBool()); s->setAttribute(QWebEngineSettings::LocalStorageEnabled, - config.value("localStorageEnabled", s->testAttribute(QWebEngineSettings::LocalStorageEnabled)).toBool()); + config.value("localStorageEnabled", s->testAttribute(QWebEngineSettings::LocalStorageEnabled)).toBool()); s->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, - config.value("localContentCanAccessRemoteUrls", s->testAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls)).toBool()); + config.value("localContentCanAccessRemoteUrls", s->testAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls)).toBool()); s->setAttribute(QWebEngineSettings::XSSAuditingEnabled, - config.value("xssAuditingEnabled", s->testAttribute(QWebEngineSettings::XSSAuditingEnabled)).toBool()); + config.value("xssAuditingEnabled", s->testAttribute(QWebEngineSettings::XSSAuditingEnabled)).toBool()); s->setAttribute(QWebEngineSettings::SpatialNavigationEnabled, - config.value("spatialNavigationEnabled", s->testAttribute(QWebEngineSettings::SpatialNavigationEnabled)).toBool()); + config.value("spatialNavigationEnabled", s->testAttribute(QWebEngineSettings::SpatialNavigationEnabled)).toBool()); s->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, - config.value("localContentCanAccessFileUrls", s->testAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls)).toBool()); + config.value("localContentCanAccessFileUrls", s->testAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls)).toBool()); s->setAttribute(QWebEngineSettings::HyperlinkAuditingEnabled, - config.value("hyperlinkAuditingEnabled", s->testAttribute(QWebEngineSettings::HyperlinkAuditingEnabled)).toBool()); + config.value("hyperlinkAuditingEnabled", s->testAttribute(QWebEngineSettings::HyperlinkAuditingEnabled)).toBool()); s->setAttribute(QWebEngineSettings::ScrollAnimatorEnabled, - config.value("scrollAnimatorEnabled", s->testAttribute(QWebEngineSettings::ScrollAnimatorEnabled)).toBool()); + config.value("scrollAnimatorEnabled", s->testAttribute(QWebEngineSettings::ScrollAnimatorEnabled)).toBool()); s->setAttribute(QWebEngineSettings::ErrorPageEnabled, - config.value("errorPageEnabled", s->testAttribute(QWebEngineSettings::ErrorPageEnabled)).toBool()); + config.value("errorPageEnabled", s->testAttribute(QWebEngineSettings::ErrorPageEnabled)).toBool()); s->setAttribute(QWebEngineSettings::PluginsEnabled, - config.value("pluginsEnabled", s->testAttribute(QWebEngineSettings::PluginsEnabled)).toBool()); + config.value("pluginsEnabled", s->testAttribute(QWebEngineSettings::PluginsEnabled)).toBool()); s->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, - config.value("fullscreenSupportEnabled", s->testAttribute(QWebEngineSettings::FullScreenSupportEnabled)).toBool()); + config.value("fullscreenSupportEnabled", s->testAttribute(QWebEngineSettings::FullScreenSupportEnabled)).toBool()); s->setAttribute(QWebEngineSettings::ScreenCaptureEnabled, - config.value("screenCaptureEnabled", s->testAttribute(QWebEngineSettings::ScreenCaptureEnabled)).toBool()); + config.value("screenCaptureEnabled", s->testAttribute(QWebEngineSettings::ScreenCaptureEnabled)).toBool()); s->setAttribute(QWebEngineSettings::WebGLEnabled, - config.value("webglEnabled", s->testAttribute(QWebEngineSettings::WebGLEnabled)).toBool()); + config.value("webglEnabled", s->testAttribute(QWebEngineSettings::WebGLEnabled)).toBool()); s->setAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled, - config.value("accelerated2dCanvasEnabled", s->testAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled)).toBool()); + config.value("accelerated2dCanvasEnabled", s->testAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled)).toBool()); s->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, - config.value("autoLoadIconsForPage", s->testAttribute(QWebEngineSettings::AutoLoadIconsForPage)).toBool()); + config.value("autoLoadIconsForPage", s->testAttribute(QWebEngineSettings::AutoLoadIconsForPage)).toBool()); s->setAttribute(QWebEngineSettings::TouchIconsEnabled, - config.value("touchIconsEnabled", s->testAttribute(QWebEngineSettings::TouchIconsEnabled)).toBool()); + config.value("touchIconsEnabled", s->testAttribute(QWebEngineSettings::TouchIconsEnabled)).toBool()); #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) s->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, - config.value("focusOnNavigationEnabled", s->testAttribute(QWebEngineSettings::FocusOnNavigationEnabled)).toBool()); + config.value("focusOnNavigationEnabled", s->testAttribute(QWebEngineSettings::FocusOnNavigationEnabled)).toBool()); s->setAttribute(QWebEngineSettings::PrintElementBackgrounds, - config.value("printElementBackgrounds", s->testAttribute(QWebEngineSettings::PrintElementBackgrounds)).toBool()); + config.value("printElementBackgrounds", s->testAttribute(QWebEngineSettings::PrintElementBackgrounds)).toBool()); s->setAttribute(QWebEngineSettings::AllowRunningInsecureContent, - config.value("allowRunningInsecureContent", s->testAttribute(QWebEngineSettings::AllowRunningInsecureContent)).toBool()); + config.value("allowRunningInsecureContent", s->testAttribute(QWebEngineSettings::AllowRunningInsecureContent)).toBool()); #endif - config.endGroup(); // attributes + config.endGroup(); // attributes } #ifdef QT_DEBUG else { diff --git a/src/webengine/webengineprofile.h b/src/webengine/webengineprofile.h index 63a97a4..bcf21bc 100644 --- a/src/webengine/webengineprofile.h +++ b/src/webengine/webengineprofile.h @@ -9,8 +9,8 @@ #ifndef WEBENGINEPROFILE_H #define WEBENGINEPROFILE_H -#include #include +#include class WebEngineProfile : public QWebEngineProfile { diff --git a/src/webengine/webpage.cpp b/src/webengine/webpage.cpp index 96ae040..c8ad24b 100644 --- a/src/webengine/webpage.cpp +++ b/src/webengine/webpage.cpp @@ -10,8 +10,8 @@ #include -WebPage::WebPage(QWebEngineProfile *profile, QObject *parent) : - QWebEnginePage(profile, parent) +WebPage::WebPage(QWebEngineProfile *profile, QObject *parent) + : QWebEnginePage(profile, parent) { connect(this, &WebPage::fullScreenRequested, this, [](QWebEngineFullScreenRequest request) { request.accept(); diff --git a/src/webengine/webview.cpp b/src/webengine/webview.cpp index ee9b134..ea0ee26 100644 --- a/src/webengine/webview.cpp +++ b/src/webengine/webview.cpp @@ -13,18 +13,18 @@ #include // zoom widget -#include -#include #include -#include #include #include +#include +#include +#include // printer support #include +#include #include #include -#include #include "mainwindow.h" #include @@ -32,8 +32,8 @@ // ssl errors #include "lib/navigation/urllineedit.h" -WebView::WebView(MainWindow *parentMainWindow, QWidget *parent) : - QWebEngineView(parent) +WebView::WebView(MainWindow *parentMainWindow, QWidget *parent) + : QWebEngineView(parent) { Q_CHECK_PTR(parentMainWindow); m_parent = parentMainWindow; @@ -140,7 +140,7 @@ void WebView::setPage(WebPage *page) WebView *WebView::createWindow(QWebEnginePage::WebWindowType type) { WebView *view = new WebView(m_parent); - switch (type) { + switch(type) { case QWebEnginePage::WebBrowserWindow: // a complete web browser window m_parent->newWindow()->tabBar->addTab(view); diff --git a/src/webengine/webview.h b/src/webengine/webview.h index 9951630..18a1e02 100644 --- a/src/webengine/webview.h +++ b/src/webengine/webview.h @@ -9,9 +9,9 @@ #ifndef WEBVIEW_H #define WEBVIEW_H -#include -#include #include "webpage.h" +#include +#include class MainWindow; class WebView : public QWebEngineView -- cgit v1.2.1