From a951b83c186f2d8d92a58387d692342cf9ad80f7 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 6 Mar 2012 09:45:58 +1000
Subject: [PATCH] Cleanup QQuickCanvas and QQuickView docs.

Mark reimplemented protected methods.

Change-Id: I544d68e16d82a37f5612fd72cd185a23c70157a7
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---
 src/quick/items/qquickcanvas.cpp | 15 ++++++++++++++-
 src/quick/items/qquickview.cpp   |  5 +++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index 3d10d55..461236d 100644
--- a/src/quick/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -163,34 +163,40 @@ QQuickRootItem::QQuickRootItem()
 {
 }
 
+/*! \reimp */
 void QQuickCanvas::exposeEvent(QExposeEvent *)
 {
     Q_D(QQuickCanvas);
     d->windowManager->exposureChanged(this);
 }
 
+/*! \reimp */
 void QQuickCanvas::resizeEvent(QResizeEvent *)
 {
     Q_D(QQuickCanvas);
     d->windowManager->resize(this, size());
 }
 
+/*! \reimp */
 void QQuickCanvas::showEvent(QShowEvent *)
 {
     d_func()->windowManager->show(this);
 }
 
+/*! \reimp */
 void QQuickCanvas::hideEvent(QHideEvent *)
 {
     d_func()->windowManager->hide(this);
 }
 
+/*! \reimp */
 void QQuickCanvas::focusOutEvent(QFocusEvent *)
 {
     Q_D(QQuickCanvas);
     d->rootItem->setFocus(false);
 }
 
+/*! \reimp */
 void QQuickCanvas::focusInEvent(QFocusEvent *)
 {
     Q_D(QQuickCanvas);
@@ -846,7 +852,7 @@ bool QQuickCanvasPrivate::clearHover()
     return accepted;
 }
 
-
+/*! \reimp */
 bool QQuickCanvas::event(QEvent *e)
 {
     Q_D(QQuickCanvas);
@@ -886,6 +892,7 @@ bool QQuickCanvas::event(QEvent *e)
     return QWindow::event(e);
 }
 
+/*! \reimp */
 void QQuickCanvas::keyPressEvent(QKeyEvent *e)
 {
     Q_D(QQuickCanvas);
@@ -894,6 +901,7 @@ void QQuickCanvas::keyPressEvent(QKeyEvent *e)
         sendEvent(d->activeFocusItem, e);
 }
 
+/*! \reimp */
 void QQuickCanvas::keyReleaseEvent(QKeyEvent *e)
 {
     Q_D(QQuickCanvas);
@@ -978,6 +986,7 @@ bool QQuickCanvasPrivate::deliverMouseEvent(QMouseEvent *event)
     return false;
 }
 
+/*! \reimp */
 void QQuickCanvas::mousePressEvent(QMouseEvent *event)
 {
     Q_D(QQuickCanvas);
@@ -990,6 +999,7 @@ void QQuickCanvas::mousePressEvent(QMouseEvent *event)
     d->deliverMouseEvent(event);
 }
 
+/*! \reimp */
 void QQuickCanvas::mouseReleaseEvent(QMouseEvent *event)
 {
     Q_D(QQuickCanvas);
@@ -1008,6 +1018,7 @@ void QQuickCanvas::mouseReleaseEvent(QMouseEvent *event)
     d->mouseGrabberItem = 0;
 }
 
+/*! \reimp */
 void QQuickCanvas::mouseDoubleClickEvent(QMouseEvent *event)
 {
     Q_D(QQuickCanvas);
@@ -1045,6 +1056,7 @@ bool QQuickCanvasPrivate::sendHoverEvent(QEvent::Type type, QQuickItem *item,
     return hoverEvent.isAccepted();
 }
 
+/*! \reimp */
 void QQuickCanvas::mouseMoveEvent(QMouseEvent *event)
 {
     Q_D(QQuickCanvas);
@@ -1178,6 +1190,7 @@ bool QQuickCanvasPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event
 }
 
 #ifndef QT_NO_WHEELEVENT
+/*! \reimp */
 void QQuickCanvas::wheelEvent(QWheelEvent *event)
 {
     Q_D(QQuickCanvas);
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index 7d1411a..ab4a3ab 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -497,6 +497,7 @@ void QQuickView::resizeEvent(QResizeEvent *e)
     QQuickCanvas::resizeEvent(e);
 }
 
+/*! \reimp */
 void QQuickView::keyPressEvent(QKeyEvent *e)
 {
     QQmlProfilerService::addEvent(QQmlProfilerService::Key);
@@ -504,6 +505,7 @@ void QQuickView::keyPressEvent(QKeyEvent *e)
     QQuickCanvas::keyPressEvent(e);
 }
 
+/*! \reimp */
 void QQuickView::keyReleaseEvent(QKeyEvent *e)
 {
     QQmlProfilerService::addEvent(QQmlProfilerService::Key);
@@ -511,6 +513,7 @@ void QQuickView::keyReleaseEvent(QKeyEvent *e)
     QQuickCanvas::keyReleaseEvent(e);
 }
 
+/*! \reimp */
 void QQuickView::mouseMoveEvent(QMouseEvent *e)
 {
     QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
@@ -518,6 +521,7 @@ void QQuickView::mouseMoveEvent(QMouseEvent *e)
     QQuickCanvas::mouseMoveEvent(e);
 }
 
+/*! \reimp */
 void QQuickView::mousePressEvent(QMouseEvent *e)
 {
     QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
@@ -525,6 +529,7 @@ void QQuickView::mousePressEvent(QMouseEvent *e)
     QQuickCanvas::mousePressEvent(e);
 }
 
+/*! \reimp */
 void QQuickView::mouseReleaseEvent(QMouseEvent *e)
 {
     QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
-- 
2.7.4