diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-01-28 10:14:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-13 14:38:08 (GMT) |
| commit | 162ee8d83c72990c33952a99bd959f18842dde10 (patch) | |
| tree | 60554db8b711150af5ebbd6b6a2ebf8f9a6be9ac /src/corelib/kernel | |
| parent | eb0262ae71d4a8576cd8ba5885d8218c9f566371 (diff) | |
| download | Qt-162ee8d83c72990c33952a99bd959f18842dde10.zip Qt-162ee8d83c72990c33952a99bd959f18842dde10.tar.gz Qt-162ee8d83c72990c33952a99bd959f18842dde10.tar.bz2 | |
Change the error message in the timer ID deallocator.
This is really an internal error since the upper layers of the
event dispatcher should have already caught a timer ID that
isn't valid.
Reviewed-By: Olivier Goffart
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index e79f87a..07f04b2 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -187,7 +187,8 @@ void QAbstractEventDispatcherPrivate::releaseTimerId(int timerId) int at = bucketIndex(bucket, which); int *b = timerIds[bucket]; - Q_ASSERT(b[at] == -timerId); + Q_ASSERT_X(timerId == -b[at], "QAbstractEventDispatcher::releaseTimerId", + "Internal error: timer ID not found"); int freeId, newTimerId; do { |