summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-01-28 11:21:16 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-01-28 11:21:16 (GMT)
commitf5c16c649137856b84d769932a9356365f3250f9 (patch)
treeabbb7a47d547245e23bd0d42257464a5bc775d13 /src/gui
parentf3ad942805cd976912ac8395ef526430b9db6350 (diff)
downloadQt-f5c16c649137856b84d769932a9356365f3250f9.zip
Qt-f5c16c649137856b84d769932a9356365f3250f9.tar.gz
Qt-f5c16c649137856b84d769932a9356365f3250f9.tar.bz2
doc: Fixed the last qdoc errors.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp17
-rw-r--r--src/gui/styles/qs60style.cpp4
2 files changed, 13 insertions, 8 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 10d31ea..d9b9416 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1570,17 +1570,18 @@ const QGraphicsObject *QGraphicsItem::toGraphicsObject() const
}
/*!
- Sets this item's parent item to \a parent. If this item already has a
- parent, it is first removed from the previous parent. If \a parent is 0,
- this item will become a top-level item.
+ Sets this item's parent item to \a newParent. If this item already
+ has a parent, it is first removed from the previous parent. If \a
+ newParent is 0, this item will become a top-level item.
- Note that this implicitly adds this graphics item to the scene of
- the parent. You should not \l{QGraphicsScene::addItem()}{add} the
- item to the scene yourself.
+ Note that this implicitly adds this graphics item to the scene of
+ the parent. You should not \l{QGraphicsScene::addItem()}{add} the
+ item to the scene yourself.
- Calling this function on an item that is an ancestor of \a parent have undefined behaviour.
+ Calling this function on an item that is an ancestor of \a newParent
+ have undefined behaviour.
- \sa parentItem(), childItems()
+ \sa parentItem(), childItems()
*/
void QGraphicsItem::setParentItem(QGraphicsItem *newParent)
{
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index ecb3242..f657fff 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -3166,6 +3166,10 @@ bool QS60Style::eventFilter(QObject *object, QEvent *event)
return QStyle::eventFilter(object, event);
}
+/*!
+ \internal
+ Handle the timer \a event.
+*/
void QS60Style::timerEvent(QTimerEvent *event)
{
#ifdef Q_WS_S60