From 9542bf254ed1c184ea2a31c92d267b71f5442b11 Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Wed, 28 Apr 2010 07:25:49 +0200
Subject: Bunch of doc fixes.

Warnings --.

Reviewed-by:TrustMe
---
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 50 +++++++++++++++++++---
 src/declarative/qml/qdeclarativeengine.cpp         |  6 ++-
 src/gui/graphicsview/qgraphicsitem.cpp             | 13 ++++++
 src/gui/graphicsview/qgraphicswidget.cpp           | 17 +++++---
 4 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index bc0c65e..928c504 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1268,11 +1268,6 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec
 */
 
 /*!
-    \property QDeclarativeItem::effect
-    \internal
-*/
-
-/*!
     \property QDeclarativeItem::focus
     \internal
 */
@@ -2728,29 +2723,48 @@ void QDeclarativeItem::setSmooth(bool smooth)
     update();
 }
 
+/*!
+    \internal
+    Return the width of the item
+*/
 qreal QDeclarativeItem::width() const
 {
     Q_D(const QDeclarativeItem);
     return d->width();
 }
 
+/*!
+    \internal
+    Set the width of the item
+*/
 void QDeclarativeItem::setWidth(qreal w)
 {
     Q_D(QDeclarativeItem);
     d->setWidth(w);
 }
 
+/*!
+    \internal
+    Reset the width of the item
+*/
 void QDeclarativeItem::resetWidth()
 {
     Q_D(QDeclarativeItem);
     d->resetWidth();
 }
 
+/*!
+    \internal
+    Return the width of the item
+*/
 qreal QDeclarativeItemPrivate::width() const
 {
     return mWidth;
 }
 
+/*!
+    \internal
+*/
 void QDeclarativeItemPrivate::setWidth(qreal w)
 {
     Q_Q(QDeclarativeItem);
@@ -2770,7 +2784,10 @@ void QDeclarativeItemPrivate::setWidth(qreal w)
                     QRectF(q->x(), q->y(), oldWidth, height()));
 }
 
-void QDeclarativeItemPrivate    ::resetWidth()
+/*!
+    \internal
+*/
+void QDeclarativeItemPrivate::resetWidth()
 {
     Q_Q(QDeclarativeItem);
     widthValid = false;
@@ -2815,29 +2832,47 @@ bool QDeclarativeItem::widthValid() const
     return d->widthValid;
 }
 
+/*!
+    \internal
+    Return the height of the item
+*/
 qreal QDeclarativeItem::height() const
 {
     Q_D(const QDeclarativeItem);
     return d->height();
 }
 
+/*!
+    \internal
+    Set the height of the item
+*/
 void QDeclarativeItem::setHeight(qreal h)
 {
     Q_D(QDeclarativeItem);
     d->setHeight(h);
 }
 
+/*!
+    \internal
+    Reset the height of the item
+*/
 void QDeclarativeItem::resetHeight()
 {
     Q_D(QDeclarativeItem);
     d->resetHeight();
 }
 
+/*!
+    \internal
+*/
 qreal QDeclarativeItemPrivate::height() const
 {
     return mHeight;
 }
 
+/*!
+    \internal
+*/
 void QDeclarativeItemPrivate::setHeight(qreal h)
 {
     Q_Q(QDeclarativeItem);
@@ -2857,6 +2892,9 @@ void QDeclarativeItemPrivate::setHeight(qreal h)
                     QRectF(q->x(), q->y(), width(), oldHeight));
 }
 
+/*!
+    \internal
+*/
 void QDeclarativeItemPrivate::resetHeight()
 {
     Q_Q(QDeclarativeItem);
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 1f7f4a0..e097edc 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -456,7 +456,11 @@ QDeclarativeEngine::~QDeclarativeEngine()
 }
 
 /*! \fn void QDeclarativeEngine::quit()
-  This signal is emitted when the QDeclarativeEngine quits.
+    This signal is emitted when the QDeclarativeEngine quits.
+ */
+
+/*! \fn void QDeclarativeEngine::warnings(const QList<QDeclarativeError> &warnings)
+    This signal is emitted when \a warnings messages are generated by QML.
  */
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 326f130..ba674dd 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7637,7 +7637,13 @@ void QGraphicsObject::ungrabGesture(Qt::GestureType gesture)
         manager->cleanupCachedGestures(this, gesture);
     }
 }
+/*!
+    Updates the item's micro focus. This is slot for convenience.
+
+    \since 4.7
 
+    \sa QInputContext
+*/
 void QGraphicsObject::updateMicroFocus()
 {
     QGraphicsItem::updateMicroFocus();
@@ -7946,6 +7952,13 @@ void QGraphicsItemPrivate::resetHeight()
 */
 
 /*!
+  \property QGraphicsObject::effect
+  \brief the effect attached to this item
+
+  \sa QGraphicsItem::setGraphicsEffect(), QGraphicsItem::graphicsEffect()
+*/
+
+/*!
     \class QAbstractGraphicsShapeItem
     \brief The QAbstractGraphicsShapeItem class provides a common base for
     all path items.
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index bc8ccb01..28b474b 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -408,12 +408,6 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
 }
 
 /*!
-  \fn QGraphicsWidget::geometryChanged()
-
-  This signal gets emitted whenever the geometry is changed in setGeometry().
-*/
-
-/*!
     \fn QRectF QGraphicsWidget::rect() const
 
     Returns the item's local rect as a QRectF. This function is equivalent
@@ -755,6 +749,17 @@ QSizeF QGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c
 }
 
 /*!
+    \property QGraphicsWidget::layout
+    \brief The layout of the widget
+*/
+
+/*!
+    \fn void QGraphicsWidget::layoutChanged()
+    This signal gets emitted whenever the layout of the item changes
+    \internal
+*/
+
+/*!
     Returns this widget's layout, or 0 if no layout is currently managing this
     widget.
 
-- 
cgit v0.12