From 73eb8fb2ddaa44cd0e8a5dac68cbc1b66f618e0e Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Wed, 20 Sep 2017 20:57:50 +0200 Subject: Replace Q_DECL_OVERRIDE with override Change-Id: I5fb337a83bfc98c23b2f3cd51839feb40fad010e Reviewed-by: Allan Sandfeld Jensen --- src/webenginewidgets/api/qwebenginepage_p.h | 116 ++++++++++++++-------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'src/webenginewidgets/api/qwebenginepage_p.h') diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index 0f18f8d8a..1724a9dde 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -82,70 +82,70 @@ public: QWebEnginePagePrivate(QWebEngineProfile *profile = 0); ~QWebEnginePagePrivate(); - virtual QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE; - virtual QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegateForPopup(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE { return CreateRenderWidgetHostViewQtDelegate(client); } - virtual void titleChanged(const QString&) Q_DECL_OVERRIDE; - virtual void urlChanged(const QUrl&) Q_DECL_OVERRIDE; - virtual void iconChanged(const QUrl&) Q_DECL_OVERRIDE; - virtual void loadProgressChanged(int progress) Q_DECL_OVERRIDE; - virtual void didUpdateTargetURL(const QUrl&) Q_DECL_OVERRIDE; - virtual void selectionChanged() Q_DECL_OVERRIDE; - virtual void recentlyAudibleChanged(bool recentlyAudible) Q_DECL_OVERRIDE; - virtual QRectF viewportRect() const Q_DECL_OVERRIDE; - virtual qreal dpiScale() const Q_DECL_OVERRIDE; - virtual QColor backgroundColor() const Q_DECL_OVERRIDE; - virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) Q_DECL_OVERRIDE; - virtual void loadCommitted() Q_DECL_OVERRIDE; - virtual void loadVisuallyCommitted() Q_DECL_OVERRIDE { } - virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) Q_DECL_OVERRIDE; - virtual void focusContainer() Q_DECL_OVERRIDE; - virtual void unhandledKeyEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - virtual void adoptNewWindow(QSharedPointer newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry, const QUrl &targetUrl) Q_DECL_OVERRIDE; + QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) override; + QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegateForPopup(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) override { return CreateRenderWidgetHostViewQtDelegate(client); } + void titleChanged(const QString&) override; + void urlChanged(const QUrl&) override; + void iconChanged(const QUrl&) override; + void loadProgressChanged(int progress) override; + void didUpdateTargetURL(const QUrl&) override; + void selectionChanged() override; + void recentlyAudibleChanged(bool recentlyAudible) override; + QRectF viewportRect() const override; + qreal dpiScale() const override; + QColor backgroundColor() const override; + void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override; + void loadCommitted() override; + void loadVisuallyCommitted() override { } + void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) override; + void focusContainer() override; + void unhandledKeyEvent(QKeyEvent *event) override; + void adoptNewWindow(QSharedPointer newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry, const QUrl &targetUrl) override; void adoptNewWindowImpl(QWebEnginePage *newPage, const QSharedPointer &newWebContents, const QRect &initialGeometry); - virtual bool isBeingAdopted() Q_DECL_OVERRIDE; - virtual void close() Q_DECL_OVERRIDE; - virtual void windowCloseRejected() Q_DECL_OVERRIDE; - virtual bool contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &data) Q_DECL_OVERRIDE; - virtual void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) Q_DECL_OVERRIDE; - virtual void requestFullScreenMode(const QUrl &origin, bool fullscreen) Q_DECL_OVERRIDE; - virtual bool isFullScreenMode() const Q_DECL_OVERRIDE; - virtual void javascriptDialog(QSharedPointer) Q_DECL_OVERRIDE; - virtual void runFileChooser(QSharedPointer) Q_DECL_OVERRIDE; - virtual void showColorDialog(QSharedPointer) Q_DECL_OVERRIDE; - virtual void didRunJavaScript(quint64 requestId, const QVariant& result) Q_DECL_OVERRIDE; - virtual void didFetchDocumentMarkup(quint64 requestId, const QString& result) Q_DECL_OVERRIDE; - virtual void didFetchDocumentInnerText(quint64 requestId, const QString& result) Q_DECL_OVERRIDE; - virtual void didFindText(quint64 requestId, int matchCount) Q_DECL_OVERRIDE; - virtual void didPrintPage(quint64 requestId, const QByteArray &result) Q_DECL_OVERRIDE; - virtual void didPrintPageToPdf(const QString &filePath, bool success) Q_DECL_OVERRIDE; - virtual void passOnFocus(bool reverse) Q_DECL_OVERRIDE; - virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID) Q_DECL_OVERRIDE; - virtual void authenticationRequired(QSharedPointer) Q_DECL_OVERRIDE; - virtual void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) Q_DECL_OVERRIDE; - virtual void runGeolocationPermissionRequest(const QUrl &securityOrigin) Q_DECL_OVERRIDE; - virtual void runMouseLockPermissionRequest(const QUrl &securityOrigin) Q_DECL_OVERRIDE; - virtual void runQuotaPermissionRequest(QSharedPointer) Q_DECL_OVERRIDE; - virtual QObject *accessibilityParentObject() Q_DECL_OVERRIDE; - virtual QtWebEngineCore::WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE; - virtual void allowCertificateError(const QSharedPointer &controller) Q_DECL_OVERRIDE; - virtual void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) Q_DECL_OVERRIDE; - virtual void hideValidationMessage() Q_DECL_OVERRIDE; - virtual void moveValidationMessage(const QRect &anchor) Q_DECL_OVERRIDE; + bool isBeingAdopted() override; + void close() override; + void windowCloseRejected() override; + bool contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &data) override; + void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) override; + void requestFullScreenMode(const QUrl &origin, bool fullscreen) override; + bool isFullScreenMode() const override; + void javascriptDialog(QSharedPointer) override; + void runFileChooser(QSharedPointer) override; + void showColorDialog(QSharedPointer) override; + void didRunJavaScript(quint64 requestId, const QVariant& result) override; + void didFetchDocumentMarkup(quint64 requestId, const QString& result) override; + void didFetchDocumentInnerText(quint64 requestId, const QString& result) override; + void didFindText(quint64 requestId, int matchCount) override; + void didPrintPage(quint64 requestId, const QByteArray &result) override; + void didPrintPageToPdf(const QString &filePath, bool success) override; + void passOnFocus(bool reverse) override; + void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID) override; + void authenticationRequired(QSharedPointer) override; + void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) override; + void runGeolocationPermissionRequest(const QUrl &securityOrigin) override; + void runMouseLockPermissionRequest(const QUrl &securityOrigin) override; + void runQuotaPermissionRequest(QSharedPointer) override; + QObject *accessibilityParentObject() override; + QtWebEngineCore::WebEngineSettings *webEngineSettings() const override; + void allowCertificateError(const QSharedPointer &controller) override; + void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) override; + void hideValidationMessage() override; + void moveValidationMessage(const QRect &anchor) override; virtual void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, - int exitCode) Q_DECL_OVERRIDE; - virtual void requestGeometryChange(const QRect &geometry) Q_DECL_OVERRIDE; - virtual void updateScrollPosition(const QPointF &position) Q_DECL_OVERRIDE; - virtual void updateContentsSize(const QSizeF &size) Q_DECL_OVERRIDE; + int exitCode) override; + void requestGeometryChange(const QRect &geometry) override; + void updateScrollPosition(const QPointF &position) override; + void updateContentsSize(const QSizeF &size) override; void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions, - const QPixmap &pixmap, const QPoint &offset) Q_DECL_OVERRIDE; - virtual bool isEnabled() const Q_DECL_OVERRIDE; - virtual void setToolTip(const QString &toolTipText) Q_DECL_OVERRIDE; - const QObject *holdingQObject() const Q_DECL_OVERRIDE; + const QPixmap &pixmap, const QPoint &offset) override; + bool isEnabled() const override; + void setToolTip(const QString &toolTipText) override; + const QObject *holdingQObject() const override; - virtual QSharedPointer browserContextAdapter() Q_DECL_OVERRIDE; - QtWebEngineCore::WebContentsAdapter *webContentsAdapter() Q_DECL_OVERRIDE; + QSharedPointer browserContextAdapter() override; + QtWebEngineCore::WebContentsAdapter *webContentsAdapter() override; void updateAction(QWebEnginePage::WebAction) const; void updateNavigationActions(); -- cgit v1.2.3