diff options
author | Julius Härtl <jus@bitgrid.net> | 2018-08-11 18:47:40 +0300 |
---|---|---|
committer | Julius Härtl <jus@bitgrid.net> | 2018-08-11 18:47:40 +0300 |
commit | 3576fbb2a593138334ef3ecabf846f684795ea9d (patch) | |
tree | cd19539e5499af1fd5c0a3cf08cedfd6263d5146 /src | |
parent | 8dedb9084e5023238fb476489cfd615761b20fcb (diff) |
Remove unused subclass of QWebEngineView
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/wizard/webview.cpp | 25 | ||||
-rw-r--r-- | src/gui/wizard/webview.h | 3 |
2 files changed, 2 insertions, 26 deletions
diff --git a/src/gui/wizard/webview.cpp b/src/gui/wizard/webview.cpp index e50ef4a13..15c1f314e 100644 --- a/src/gui/wizard/webview.cpp +++ b/src/gui/wizard/webview.cpp @@ -37,14 +37,6 @@ Q_SIGNALS: void urlCatched(QString user, QString pass, QString host); }; -class WebEngineView : public QWebEngineView { - Q_OBJECT -public: - WebEngineView(QWidget* parent = 0); - bool acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame); -}; - - class WebEnginePage : public QWebEnginePage { public: WebEnginePage(QWebEngineProfile *profile, QObject* parent = nullptr); @@ -65,7 +57,7 @@ WebView::WebView(QWidget *parent) { _ui.setupUi(this); - _webview = new WebEngineView(this); + _webview = new QWebEngineView(this); _profile = new QWebEngineProfile(this); _page = new WebEnginePage(_profile); _interceptor = new WebViewPageUrlRequestInterceptor(this); @@ -165,21 +157,6 @@ bool ExternalWebEnginePage::acceptNavigationRequest(const QUrl &url, QWebEngineP return false; } - -WebEngineView::WebEngineView(QWidget* parent) : QWebEngineView (parent) { - -} - -bool WebEngineView::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame) -{ - if (type == QWebEnginePage::NavigationTypeLinkClicked) - { - QDesktopServices::openUrl(url); - return false; - } - return true; -} - } #include "webview.moc" diff --git a/src/gui/wizard/webview.h b/src/gui/wizard/webview.h index 01529ef09..1146cd845 100644 --- a/src/gui/wizard/webview.h +++ b/src/gui/wizard/webview.h @@ -14,7 +14,6 @@ namespace OCC { class WebViewPageUrlRequestInterceptor; class WebViewPageUrlSchemeHandler; -class WebEngineView; class WebEnginePage; class WebView : public QWidget @@ -30,7 +29,7 @@ signals: private: Ui_WebView _ui; - WebEngineView *_webview; + QWebEngineView *_webview; QWebEngineProfile *_profile; WebEnginePage *_page; |