From e97da8bc9dee8f58674d8dd69f7a809eed4c6aa6 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Mon, 19 Aug 2024 19:48:38 +0300 Subject: [PATCH] QChronoTimer: compare timer IDs to Qt::TimerId::Invalid consistently Always `if (id != Qt::TimerId::Invalid)`. Change-Id: If16e1cb54d3e7b4325019eb292263c25cd7d3805 Reviewed-by: Volker Hilsheimer (cherry picked from commit 637fcc69c87352c21658fea1083e93786f64fc37) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qchronotimer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qchronotimer.cpp b/src/corelib/kernel/qchronotimer.cpp index b6926666363..61b3ec7ca17 100644 --- a/src/corelib/kernel/qchronotimer.cpp +++ b/src/corelib/kernel/qchronotimer.cpp @@ -193,7 +193,7 @@ void QChronoTimer::start() if (d->isActive()) // stop running timer stop(); 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->isActiveData.notify(); } @@ -293,7 +293,7 @@ void QChronoTimer::setInterval(std::chrono::nanoseconds nsec) if (d->isActive()) { // Create new timer QObject::killTimer(d->id); // Restart timer 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. d->id = newId; } else {