1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QChronoTimer: compare timer IDs to Qt::TimerId::Invalid consistently

Browse Source 
Always `if (id != Qt::TimerId::Invalid)`.

Pick-to: 6.8
Change-Id: If16e1cb54d3e7b4325019eb292263c25cd7d3805
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Ahmad Samir 2024-08-19 19:48:38 +03:00
parent 991df1a513
commit 637fcc69c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qchronotimer.cpp
View File

@ -193,7 +193,7 @@ void QChronoTimer::start()
if (d->isActive()) // stop running timer if (d->isActive()) // stop running timer
stop(); stop();
const auto id = Qt::TimerId{QObject::startTimer(d->intervalDuration, d->type)}; const auto id = Qt::TimerId{QObject::startTimer(d->intervalDuration, d->type)};
if (id > Qt::TimerId::Invalid) { if (id != Qt::TimerId::Invalid) {
d->id = id; d->id = id;
d->isActiveData.notify(); d->isActiveData.notify();
} }
@ -293,7 +293,7 @@ void QChronoTimer::setInterval(std::chrono::nanoseconds nsec)
if (d->isActive()) { // Create new timer if (d->isActive()) { // Create new timer
QObject::killTimer(d->id); // Restart timer QObject::killTimer(d->id); // Restart timer
const auto newId = Qt::TimerId{QObject::startTimer(nsec, d->type)}; const auto newId = Qt::TimerId{QObject::startTimer(nsec, d->type)};
if (newId > Qt::TimerId::Invalid) { if (newId != Qt::TimerId::Invalid) {
// Restarted successfully. No need to update the active state. // Restarted successfully. No need to update the active state.
d->id = newId; d->id = newId;
} else { } else {