summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-09-21 13:29:38 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-09-21 13:30:53 (GMT)
commitec76b17145c6449a5d90a1052635f30971e7fa4d (patch)
tree5815c51562bf4070b1710754292aff2ed34bc4da /src/corelib
parent00a8d21fff66cd2aec5ea0b6158a4f9923a6732f (diff)
downloadQt-ec76b17145c6449a5d90a1052635f30971e7fa4d.zip
Qt-ec76b17145c6449a5d90a1052635f30971e7fa4d.tar.gz
Qt-ec76b17145c6449a5d90a1052635f30971e7fa4d.tar.bz2
qdoc: Added \brief texts to all the since 4.6 functions.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qglobal.cpp5
-rw-r--r--src/corelib/io/qprocess.cpp10
-rw-r--r--src/corelib/tools/qsharedpointer.cpp4
3 files changed, 14 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 1d29b3b..4974acf 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2678,6 +2678,8 @@ int qrand()
\reentrant
\since 4.6
+ \brief The qtTrId function finds and returns a translated string.
+
Returns a translated string identified by \a id.
If no matching string is found, the id itself is returned. This
should not happen under normal conditions.
@@ -2715,7 +2717,8 @@ int qrand()
\relates <QtGlobal>
\since 4.6
- Marks \a id for dynamic translation.
+ \brief The QT_TRID_NOOP macro marks an id for dynamic translation.
+
The only purpose of this macro is to provide an anchor for attaching
meta data like to qtTrId().
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 6ce38b2..a6a61dd 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -2204,11 +2204,13 @@ QStringList QProcess::systemEnvironment()
/*!
\since 4.6
- Returns the environment of the calling process as a QProcessEnvironment.
+ \brief The systemEnvironment function returns the environment of
+ the calling process.
- This function does not cache the system environment. Therefore, it's
- possible to obtain an updated version of the environment if low-level C
- library functions like \tt setenv ot \tt putenv have been called.
+ It is returned as a QProcessEnvironment. This function does not
+ cache the system environment. Therefore, it's possible to obtain
+ an updated version of the environment if low-level C library
+ functions like \tt setenv ot \tt putenv have been called.
However, note that repeated calls to this function will recreate the
QProcessEnvironment object, which is a non-trivial operation.
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index 579d944..fedec08 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -1162,6 +1162,8 @@
\relates QSharedPointer
\since 4.6
+ \brief The qSharedPointerObjectCast function is for casting a shared pointer.
+
Returns a shared pointer to the pointer held by \a other, using a
\l qobject_cast() to type \tt X to obtain an internal pointer of the
appropriate type. If the \tt qobject_cast fails, the object
@@ -1180,6 +1182,8 @@
\relates QWeakPointer
\since 4.6
+ \brief The qSharedPointerObjectCast function is for casting a shared pointer.
+
Returns a shared pointer to the pointer held by \a other, using a
\l qobject_cast() to type \tt X to obtain an internal pointer of the
appropriate type. If the \tt qobject_cast fails, the object