From 213fbe760b5ecbbaffb383361a054eeb5672538a Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Date: Mon, 18 Apr 2016 17:14:40 +0200
Subject: demobrowser: Remove unused loadingUrl

Remove the unused m_loadingUrl member.
Remove the loadingUrl signal that was forwarded to urlChanged.
QWebEngineView already emits urlChanged. There's no need to do this twice.

Change-Id: Ib9734c5b1571745f7b82b4e5f2bc92c7f1d8f51c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
 examples/webenginewidgets/demobrowser/webview.cpp | 12 ------------
 examples/webenginewidgets/demobrowser/webview.h   |  6 ------
 2 files changed, 18 deletions(-)

diff --git a/examples/webenginewidgets/demobrowser/webview.cpp b/examples/webenginewidgets/demobrowser/webview.cpp
index 42f725fe8..9feedc0b5 100644
--- a/examples/webenginewidgets/demobrowser/webview.cpp
+++ b/examples/webenginewidgets/demobrowser/webview.cpp
@@ -96,16 +96,6 @@ BrowserMainWindow *WebPage::mainWindow()
     return BrowserApplication::instance()->mainWindow();
 }
 
-bool WebPage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
-{
-    Q_UNUSED(type);
-    if (isMainFrame) {
-        m_loadingUrl = url;
-        emit loadingUrl(m_loadingUrl);
-    }
-    return true;
-}
-
 bool WebPage::certificateError(const QWebEngineCertificateError &error)
 {
     if (error.isOverridable()) {
@@ -357,8 +347,6 @@ void WebView::setPage(WebPage *_page)
     connect(page(), SIGNAL(statusBarMessage(QString)),
             SLOT(setStatusBarText(QString)));
 #endif
-    connect(page(), SIGNAL(loadingUrl(QUrl)),
-            this, SIGNAL(urlChanged(QUrl)));
     connect(page(), SIGNAL(iconUrlChanged(QUrl)),
             this, SLOT(onIconUrlChanged(QUrl)));
     connect(page(), &WebPage::featurePermissionRequested, this, &WebView::onFeaturePermissionRequested);
diff --git a/examples/webenginewidgets/demobrowser/webview.h b/examples/webenginewidgets/demobrowser/webview.h
index 6d9cd46ab..c506ec8b9 100644
--- a/examples/webenginewidgets/demobrowser/webview.h
+++ b/examples/webenginewidgets/demobrowser/webview.h
@@ -55,16 +55,11 @@ QT_END_NAMESPACE
 class BrowserMainWindow;
 class WebPage : public QWebEnginePage {
     Q_OBJECT
-
-signals:
-    void loadingUrl(const QUrl &url);
-
 public:
     WebPage(QWebEngineProfile *profile, QObject *parent = 0);
     BrowserMainWindow *mainWindow();
 
 protected:
-    bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) Q_DECL_OVERRIDE;
     QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) Q_DECL_OVERRIDE;
 #if !defined(QT_NO_UITOOLS)
     QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
@@ -84,7 +79,6 @@ private:
     // set the webview mousepressedevent
     Qt::KeyboardModifiers m_keyboardModifiers;
     Qt::MouseButtons m_pressedButtons;
-    QUrl m_loadingUrl;
 };
 
 class WebView : public QWebEngineView {
-- 
cgit v1.2.3