summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-10-10 20:11:44 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-10-10 21:21:43 +0000
commit766858f1879ed03fcc8776df3bff2cc97dd60a97 (patch)
treeea91b45258cdf145f4d1f8ea9d24095324019199
parent45411b453d553abee71e61938c3e87af043cd044 (diff)
Added missing Q_DECL_OVERRIDEs to QML API headers
Change-Id: Ic8f0fc6fe055cd432aaff8e46d62c0f8d41e61f8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h2
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h46
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h22
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h2
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h6
5 files changed, 39 insertions, 39 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h
index e2aaa6c38..988135877 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h
@@ -44,7 +44,7 @@ public:
QTransform transformToItem() const;
protected:
- virtual QSGNode* updatePaintNode(QSGNode*, UpdatePaintNodeData*);
+ QSGNode* updatePaintNode(QSGNode*, UpdatePaintNodeData*) Q_DECL_OVERRIDE;
private:
QQuickWebPagePrivate* d;
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
index 1daf5db0a..c06f8f219 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
@@ -136,7 +136,7 @@ public:
bool canGoForward() const;
bool loading() const;
- virtual QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
+ QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE;
QPointF mapToWebContent(const QPointF&) const;
QRectF mapRectToWebContent(const QRectF&) const;
@@ -177,28 +177,28 @@ Q_SIGNALS:
void navigationRequested(QWebNavigationRequest* request);
protected:
- virtual bool childMouseEventFilter(QQuickItem*, QEvent*);
- virtual void geometryChanged(const QRectF&, const QRectF&);
- virtual void componentComplete();
- virtual void keyPressEvent(QKeyEvent*);
- virtual void keyReleaseEvent(QKeyEvent*);
- virtual void inputMethodEvent(QInputMethodEvent*);
- virtual void focusInEvent(QFocusEvent*);
- virtual void itemChange(ItemChange change, const ItemChangeData &value);
- virtual void touchEvent(QTouchEvent*);
- virtual void mousePressEvent(QMouseEvent*);
- virtual void mouseMoveEvent(QMouseEvent*);
- virtual void mouseReleaseEvent(QMouseEvent *);
- virtual void mouseDoubleClickEvent(QMouseEvent*);
- virtual void wheelEvent(QWheelEvent*);
- virtual void hoverEnterEvent(QHoverEvent*);
- virtual void hoverMoveEvent(QHoverEvent*);
- virtual void hoverLeaveEvent(QHoverEvent*);
- virtual void dragMoveEvent(QDragMoveEvent*);
- virtual void dragEnterEvent(QDragEnterEvent*);
- virtual void dragLeaveEvent(QDragLeaveEvent*);
- virtual void dropEvent(QDropEvent*);
- virtual bool event(QEvent*);
+ bool childMouseEventFilter(QQuickItem*, QEvent*) Q_DECL_OVERRIDE;
+ void geometryChanged(const QRectF&, const QRectF&) Q_DECL_OVERRIDE;
+ void componentComplete() Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE;
+ void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE;
+ void inputMethodEvent(QInputMethodEvent*) Q_DECL_OVERRIDE;
+ void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE;
+ void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE;
+ void touchEvent(QTouchEvent*) Q_DECL_OVERRIDE;
+ void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent(QMouseEvent*) Q_DECL_OVERRIDE;
+ void wheelEvent(QWheelEvent*) Q_DECL_OVERRIDE;
+ void hoverEnterEvent(QHoverEvent*) Q_DECL_OVERRIDE;
+ void hoverMoveEvent(QHoverEvent*) Q_DECL_OVERRIDE;
+ void hoverLeaveEvent(QHoverEvent*) Q_DECL_OVERRIDE;
+ void dragMoveEvent(QDragMoveEvent*) Q_DECL_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent*) Q_DECL_OVERRIDE;
+ void dragLeaveEvent(QDragLeaveEvent*) Q_DECL_OVERRIDE;
+ void dropEvent(QDropEvent*) Q_DECL_OVERRIDE;
+ bool event(QEvent*) Q_DECL_OVERRIDE;
private:
Q_DECLARE_PRIVATE(QQuickWebView)
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
index a7358b5cf..ea7ded46b 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
@@ -231,28 +231,28 @@ class QQuickWebViewLegacyPrivate : public QQuickWebViewPrivate {
Q_DECLARE_PUBLIC(QQuickWebView)
public:
QQuickWebViewLegacyPrivate(QQuickWebView* viewport);
- virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
+ void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0) Q_DECL_OVERRIDE;
- virtual void updateViewportSize();
+ void updateViewportSize() Q_DECL_OVERRIDE;
- qreal zoomFactor() const;
- void setZoomFactor(qreal);
+ qreal zoomFactor() const Q_DECL_OVERRIDE;
+ void setZoomFactor(qreal) Q_DECL_OVERRIDE;
};
class QQuickWebViewFlickablePrivate : public QQuickWebViewPrivate {
Q_DECLARE_PUBLIC(QQuickWebView)
public:
QQuickWebViewFlickablePrivate(QQuickWebView* viewport);
- virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
+ void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0) Q_DECL_OVERRIDE;
- virtual void onComponentComplete();
+ void onComponentComplete() Q_DECL_OVERRIDE;
- virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
- virtual WebKit::PageViewportController* viewportController() const { return m_pageViewportController.data(); }
- virtual void updateViewportSize();
+ void didChangeViewportProperties(const WebCore::ViewportAttributes&) Q_DECL_OVERRIDE;
+ WebKit::PageViewportController* viewportController() const Q_DECL_OVERRIDE { return m_pageViewportController.data(); }
+ void updateViewportSize() Q_DECL_OVERRIDE;
- virtual void pageDidRequestScroll(const QPoint& pos);
- virtual void handleMouseEvent(QMouseEvent*);
+ void pageDidRequestScroll(const QPoint& pos) Q_DECL_OVERRIDE;
+ void handleMouseEvent(QMouseEvent*) Q_DECL_OVERRIDE;
private:
QScopedPointer<WebKit::PageViewportController> m_pageViewportController;
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h b/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h
index 10b2f697e..2d903e9cd 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h
@@ -36,7 +36,7 @@ public:
static QString identifier() { return QStringLiteral("webicon"); }
QUrl iconURLForPageURLInContext(const QString& pageURL, WebKit::QtWebContext* context);
- virtual QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize);
+ QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize) Q_DECL_OVERRIDE;
};
#endif
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h
index 84ef867be..06a804a17 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h
@@ -46,9 +46,9 @@ class QWEBKIT_EXPORT QWebNavigationListModel : public QAbstractListModel {
public:
virtual ~QWebNavigationListModel();
- int rowCount(const QModelIndex& parent = QModelIndex()) const;
- QVariant data(const QModelIndex& index, int role) const;
- QHash<int, QByteArray> roleNames() const;
+ int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE;
+ QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
void reset();
private: