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

QTest::qWaitFor: scope a variable tighter

Browse Source 
When fa296ee1dcf4c16fb6f242cf08949485e499fec3 ported this function
from int timeout to QDeadlineTimer, the need to keep this variable
outside the do-while so it could be checked in the loop exit condition
fell away.

Moving the definition of the variable to the first (and only)
assignment makes the code clearer and the variable a constant.

Amends fa296ee1dcf4c16fb6f242cf08949485e499fec3.

Change-Id: I7a0fe01dc68ff140beeb0e76b141c84d4bd28458
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit ef7b641a3cf267e256468f9a6269a9bcf7656aa9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-03-08 11:23:10 +01:00 committed by Qt Cherry-pick Bot
parent a7be16764d
commit 1b37133aca
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qtestsupport_core.h
View File

@ -30,7 +30,6 @@ qWaitFor(Functor predicate, QDeadlineTimer deadline = QDeadlineTimer(std::chrono
using namespace std::chrono;
auto remaining = 0ms;
do {
// We explicitly do not pass the remaining time to processEvents, as
// that would keep spinning processEvents for the whole duration if
@ -49,7 +48,7 @@ qWaitFor(Functor predicate, QDeadlineTimer deadline = QDeadlineTimer(std::chrono
continue;
}
remaining = ceil<milliseconds>(deadline.remainingTimeAsDuration());
const auto remaining = ceil<milliseconds>(deadline.remainingTimeAsDuration());
if (remaining == 0ms)
break;