summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2010-08-06 15:07:51 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2010-08-06 15:07:51 (GMT)
commitab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d (patch)
treeb4982b4aee75c617c23d5fc15aa89963308e6b23
parent209c017333fea9827fd20c7f8d23721bd8a6ee43 (diff)
downloadQt-ab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d.zip
Qt-ab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d.tar.gz
Qt-ab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d.tar.bz2
Modified descriptions of QBasicTimer class and isActive() function.
Reviewed by: David Boddie Task: QTBUG-12313
-rw-r--r--src/corelib/kernel/qbasictimer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp
index d176170..d595ac1 100644
--- a/src/corelib/kernel/qbasictimer.cpp
+++ b/src/corelib/kernel/qbasictimer.cpp
@@ -54,7 +54,8 @@ QT_BEGIN_NAMESPACE
This is a fast, lightweight, and low-level class used by Qt
internally. We recommend using the higher-level QTimer class
rather than this class if you want to use timers in your
- applications.
+ applications. Note that this timer is a repeating timer that
+ will send subsequent timer events unless the stop() function is called.
To use this class, create a QBasicTimer, and call its start()
function with a timeout interval and with a pointer to a QObject
@@ -88,8 +89,8 @@ QT_BEGIN_NAMESPACE
/*!
\fn bool QBasicTimer::isActive() const
- Returns true if the timer is running, has not yet timed
- out, and has not been stopped; otherwise returns false.
+ Returns true if the timer is running and has not been stopped; otherwise
+ returns false.
\sa start() stop()
*/