summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qdeadlinetimer.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-03-09 17:21:24 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-03-11 12:27:40 +0100
commit296bbbfa5098d8af5c4d55facd1497a275e15c70 (patch)
tree9e65955230a0969fd04e66b5a1d44b643055a715 /src/corelib/kernel/qdeadlinetimer.cpp
parent12f903b1551c0277e41913989f20e8728c018df6 (diff)
Fix minor errors in QDeadlineTimer docs
Change-Id: I0f33094da29300ca8a609cfffd700c2a82d86ad1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/corelib/kernel/qdeadlinetimer.cpp')
-rw-r--r--src/corelib/kernel/qdeadlinetimer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp
index 06b56bb09b..520153b2e5 100644
--- a/src/corelib/kernel/qdeadlinetimer.cpp
+++ b/src/corelib/kernel/qdeadlinetimer.cpp
@@ -438,8 +438,8 @@ inline bool TimeReference::toNanoseconds(qint64 *result) const
For such objects, remainingTime() will return -1, deadline() will return the
maximum value, and isForever() will return true.
- The timer type \a timerType may be ignored, since the timer is already
- expired.
+ The timer type \a timerType may be ignored, since the timer will never
+ expire.
\sa ForeverConstant, hasExpired(), isForever(), remainingTime(), timerType()
*/
@@ -449,9 +449,9 @@ inline bool TimeReference::toNanoseconds(qint64 *result) const
from the moment of the creation of this object, if msecs is positive. If \a
msecs is zero, this QDeadlineTimer will be marked as expired, causing
remainingTime() to return zero and deadline() to return an indeterminate
- time point in the past. If \a msecs is -1, the timer will be set it to
- never expire, causing remainingTime() to return -1 and deadline() to return
- the maximum value.
+ time point in the past. If \a msecs is -1, the timer will be set to never
+ expire, causing remainingTime() to return -1 and deadline() to return the
+ maximum value.
The QDeadlineTimer object will be constructed with the specified timer \a type.