summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/api/qwebenginepage.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.h')
-rw-r--r--src/webenginewidgets/api/qwebenginepage.h26
1 files changed, 2 insertions, 24 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index d716765fe..f81ba7373 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -243,12 +243,9 @@ public:
void replaceMisspelledWord(const QString &replacement);
virtual bool event(QEvent*);
-#ifdef Q_QDOC
- void findText(const QString &subString, FindFlags options = FindFlags());
- void findText(const QString &subString, FindFlags options, FunctorOrLambda resultCallback);
-#else
+
void findText(const QString &subString, FindFlags options = FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
-#endif
+
QMenu *createStandardContextMenu();
void setFeaturePermission(const QUrl &securityOrigin, Feature feature, PermissionPolicy policy);
@@ -259,13 +256,8 @@ public:
void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
-#ifdef Q_QDOC
- void toHtml(FunctorOrLambda resultCallback) const;
- void toPlainText(FunctorOrLambda resultCallback) const;
-#else
void toHtml(const QWebEngineCallback<const QString &> &resultCallback) const;
void toPlainText(const QWebEngineCallback<const QString &> &resultCallback) const;
-#endif
QString title() const;
void setUrl(const QUrl &url);
@@ -282,13 +274,8 @@ public:
void runJavaScript(const QString& scriptSource);
void runJavaScript(const QString& scriptSource, quint32 worldId);
-#ifdef Q_QDOC
- void runJavaScript(const QString& scriptSource, FunctorOrLambda resultCallback);
- void runJavaScript(const QString& scriptSource, quint32 worldId, FunctorOrLambda resultCallback);
-#else
void runJavaScript(const QString& scriptSource, const QWebEngineCallback<const QVariant &> &resultCallback);
void runJavaScript(const QString& scriptSource, quint32 worldId, const QWebEngineCallback<const QVariant &> &resultCallback);
-#endif
QWebEngineScriptCollection &scripts();
QWebEngineSettings *settings() const;
@@ -306,17 +293,8 @@ public:
bool recentlyAudible() const;
void printToPdf(const QString &filePath, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()));
-#ifdef Q_QDOC
- void printToPdf(FunctorOrLambda resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()));
-#else
void printToPdf(const QWebEngineCallback<const QByteArray&> &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()));
-#endif
-
-#ifdef Q_QDOC
- void print(QPrinter *printer, FunctorOrLambda resultCallback);
-#else
void print(QPrinter *printer, const QWebEngineCallback<bool> &resultCallback);
-#endif // QDOC
void setInspectedPage(QWebEnginePage *page);
QWebEnginePage *inspectedPage() const;