diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-06 16:27:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-09 03:26:29 +0200 |
| commit | 6a8537356be5766fcdc5cf8fcb5fabb81abd09e7 (patch) | |
| tree | 67c5e357d96c7d51d873f89bf017959ba326b3ab /src/corelib/tools/qelapsedtimer.cpp | |
| parent | 44e638f06965e1022a0da7a48105c83a6d373547 (diff) | |
Mark QElapsedTimer functions as Q_DECL_NOTHROW
All functions in QElapsedTimer are marked Q_DECL_NOTHROW. This code
is often introduced in many places to deal with timeouts and doesn't
need exception handlers. In particular, it's used in QMutex locking.
In addition, mark QDateTime::currentMSecsSinceEpoch as nothrow, as it
can't throw exceptions either and it is needed by the generic
QElapsedTimer.
Q{Date,Time}::current{Date,Time} operate on local time and run into at
least one cancellation point, which we must consider throwing. And
returning a QDateTime allocates memory.
Change-Id: Id776c5ec831fc06d7419a9ff5442d9b35cff1a22
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qelapsedtimer.cpp')
| -rw-r--r-- | src/corelib/tools/qelapsedtimer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp index 76b0d796f00..61cc47512d9 100644 --- a/src/corelib/tools/qelapsedtimer.cpp +++ b/src/corelib/tools/qelapsedtimer.cpp @@ -224,7 +224,7 @@ static const qint64 invalidData = Q_INT64_C(0x8000000000000000); \sa isValid(), start(), restart() */ -void QElapsedTimer::invalidate() +void QElapsedTimer::invalidate() Q_DECL_NOTHROW { t1 = t2 = invalidData; } @@ -235,7 +235,7 @@ void QElapsedTimer::invalidate() \sa invalidate(), start(), restart() */ -bool QElapsedTimer::isValid() const +bool QElapsedTimer::isValid() const Q_DECL_NOTHROW { return t1 != invalidData && t2 != invalidData; } @@ -248,7 +248,7 @@ bool QElapsedTimer::isValid() const \sa elapsed() */ -bool QElapsedTimer::hasExpired(qint64 timeout) const +bool QElapsedTimer::hasExpired(qint64 timeout) const Q_DECL_NOTHROW { // if timeout is -1, quint64(timeout) is LLINT_MAX, so this will be // considered as never expired |