From 6b39dc9cf08191d3b4fb7a0b80f2d215a04abe72 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 6 Feb 2017 20:43:40 +0100 Subject: [PATCH] WebPage: Remove no longer needed copies of runJavaScript functions --- src/lib/webengine/webpage.cpp | 20 -------------------- src/lib/webengine/webpage.h | 6 ------ 2 files changed, 26 deletions(-) diff --git a/src/lib/webengine/webpage.cpp b/src/lib/webengine/webpage.cpp index 8026eece5..2578eb327 100644 --- a/src/lib/webengine/webpage.cpp +++ b/src/lib/webengine/webpage.cpp @@ -145,26 +145,6 @@ QVariant WebPage::execJavaScript(const QString &scriptSource, quint32 worldId, i return result; } -void WebPage::runJavaScript(const QString &scriptSource) -{ - return QWebEnginePage::runJavaScript(scriptSource); -} - -void WebPage::runJavaScript(const QString &scriptSource, const QWebEngineCallback &resultCallback) -{ - return QWebEnginePage::runJavaScript(scriptSource, resultCallback); -} - -void WebPage::runJavaScript(const QString &scriptSource, quint32 worldId) -{ - QWebEnginePage::runJavaScript(scriptSource, worldId); -} - -void WebPage::runJavaScript(const QString &scriptSource, quint32 worldId, const QWebEngineCallback &resultCallback) -{ - QWebEnginePage::runJavaScript(scriptSource, worldId, resultCallback); -} - QPointF WebPage::mapToViewport(const QPointF &pos) const { return QPointF(pos.x() / zoomFactor(), pos.y() / zoomFactor()); diff --git a/src/lib/webengine/webpage.h b/src/lib/webengine/webpage.h index 4ae49c1e2..07c93a447 100644 --- a/src/lib/webengine/webpage.h +++ b/src/lib/webengine/webpage.h @@ -50,12 +50,6 @@ public: bool execPrintPage(QPrinter *printer, int timeout = 1000); QVariant execJavaScript(const QString &scriptSource, quint32 worldId = QWebEngineScript::MainWorld, int timeout = 500); - // TODO: Remove when depending on Qt 5.7 - void runJavaScript(const QString &scriptSource); - void runJavaScript(const QString &scriptSource, const QWebEngineCallback &resultCallback); - void runJavaScript(const QString &scriptSource, quint32 worldId); - void runJavaScript(const QString &scriptSource, quint32 worldId, const QWebEngineCallback &resultCallback); - QPointF mapToViewport(const QPointF &pos) const; WebHitTestResult hitTestContent(const QPoint &pos) const;