summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-12-18 13:23:13 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-12-18 13:23:13 (GMT)
commit12e2c9075e694897ae52048c2069f57a22ef4031 (patch)
tree02e5d95dffa2d1cd6558570752059525cb0856b9
parent0d212670c06ed54ac785e0bb945c792947d388f5 (diff)
downloadQt-12e2c9075e694897ae52048c2069f57a22ef4031.zip
Qt-12e2c9075e694897ae52048c2069f57a22ef4031.tar.gz
Qt-12e2c9075e694897ae52048c2069f57a22ef4031.tar.bz2
doc: Added a missing \sa command, plus a \l in the text.
Task-number: QTBUG-6288
-rw-r--r--src/corelib/kernel/qobject.cpp15
-rw-r--r--tools/qdoc3/cppcodeparser.cpp6
2 files changed, 11 insertions, 10 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 4370ee0..305ec4f 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -578,12 +578,13 @@ int QMetaCallEvent::placeMetaCall(QObject *object)
protected functions connectNotify() and disconnectNotify() make
it possible to track connections.
- QObjects organize themselves in object trees. When you create a
- QObject with another object as parent, the object will
- automatically add itself to the parent's children() list. The
- parent takes ownership of the object; i.e., it will automatically
- delete its children in its destructor. You can look for an object
- by name and optionally type using findChild() or findChildren().
+ QObjects organize themselves in \l {Object Trees and Object
+ Ownership} {object trees}. When you create a QObject with another
+ object as parent, the object will automatically add itself to the
+ parent's children() list. The parent takes ownership of the
+ object; i.e., it will automatically delete its children in its
+ destructor. You can look for an object by name and optionally type
+ using findChild() or findChildren().
Every object has an objectName() and its class name can be found
via the corresponding metaObject() (see QMetaObject::className()).
@@ -682,7 +683,7 @@ int QMetaCallEvent::placeMetaCall(QObject *object)
\l{Writing Source Code for Translation} document.
\sa QMetaObject, QPointer, QObjectCleanupHandler, Q_DISABLE_COPY()
- {Object Trees and Object Ownership}
+ \sa {Object Trees and Object Ownership}
*/
/*!
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index 41a2456..9ec7fdf 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -2318,9 +2318,9 @@ void CppCodeParser::createExampleFileNodes(FakeNode *fake)
exampleFile.mid(sizeOfBoringPartOfName),
Node::File);
foreach (const QString &imageFile, imageFiles) {
- FakeNode* newFake = new FakeNode(fake,
- imageFile.mid(sizeOfBoringPartOfName),
- Node::Image);
+ new FakeNode(fake,
+ imageFile.mid(sizeOfBoringPartOfName),
+ Node::Image);
}
}