diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-06 17:15:12 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-14 15:43:48 +0100 |
commit | 496f66ee52214ac614135c736f7d89c4dd08ba14 (patch) | |
tree | bd4de6a9909846b53f1edbd58d2914e16ef5f2d1 /lib/widgets | |
parent | e1f0ec1af9bcef187bc132e29101b3f7c9c367c1 (diff) |
Mark functions with Q_DECL_OVERRIDE where necessary.
Change-Id: I15261c3737a3284b99308453132f09ee7889c444
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'lib/widgets')
-rw-r--r-- | lib/widgets/Api/qwebenginepage.h | 2 | ||||
-rw-r--r-- | lib/widgets/render_widget_host_view_qt_delegate_widget.h | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/lib/widgets/Api/qwebenginepage.h b/lib/widgets/Api/qwebenginepage.h index c6e397197..a613f4a27 100644 --- a/lib/widgets/Api/qwebenginepage.h +++ b/lib/widgets/Api/qwebenginepage.h @@ -60,7 +60,7 @@ struct FunctorBase { template <typename F> struct FunctorCallback : public FunctorBase { FunctorCallback(F callback) : m_callback(callback) {} - virtual void operator()(const QVariant &value) { m_callback(value); } + virtual void operator()(const QVariant &value) Q_DECL_OVERRIDE { m_callback(value); } private: F m_callback; }; diff --git a/lib/widgets/render_widget_host_view_qt_delegate_widget.h b/lib/widgets/render_widget_host_view_qt_delegate_widget.h index ccb11df29..7ec91931f 100644 --- a/lib/widgets/render_widget_host_view_qt_delegate_widget.h +++ b/lib/widgets/render_widget_host_view_qt_delegate_widget.h @@ -58,20 +58,20 @@ class RenderWidgetHostViewQtDelegateWidget : public QWidget, public RenderWidget public: RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQtDelegateClient *client, QWidget *parent = 0); - virtual void initAsChild(WebContentsAdapterClient* container); - virtual void initAsPopup(const QRect&); - virtual QRectF screenRect() const; - virtual void setKeyboardFocus(); - virtual bool hasKeyboardFocus(); - virtual void show(); - virtual void hide(); - virtual bool isVisible() const; - virtual WId nativeWindowIdForCompositor() const; - virtual QWindow* window() const; - virtual void update(const QRect& rect = QRect()); - virtual void updateCursor(const QCursor &); - virtual void resize(int width, int height); - virtual void inputMethodStateChanged(bool editorVisible); + virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE; + virtual void initAsPopup(const QRect&) Q_DECL_OVERRIDE; + virtual QRectF screenRect() const Q_DECL_OVERRIDE; + virtual void setKeyboardFocus() Q_DECL_OVERRIDE; + virtual bool hasKeyboardFocus() Q_DECL_OVERRIDE; + virtual void show() Q_DECL_OVERRIDE; + virtual void hide() Q_DECL_OVERRIDE; + virtual bool isVisible() const Q_DECL_OVERRIDE; + virtual WId nativeWindowIdForCompositor() const Q_DECL_OVERRIDE; + virtual QWindow* window() const Q_DECL_OVERRIDE; + virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE; + virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE; + virtual void resize(int width, int height) Q_DECL_OVERRIDE; + virtual void inputMethodStateChanged(bool editorVisible) Q_DECL_OVERRIDE; protected: void paintEvent(QPaintEvent * event); |