From 027ee82051beed3fa58bd4e80bc8408a9b05fc81 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 13 Nov 2024 11:44:57 -0800 Subject: [PATCH] QPostEventList: use qsizetype to count posted events It's highly unlikely you're going to have more than 2 billion pending events for a thread, but this is the right thing to do. Change-Id: Ia162b024815c3b970d71fffd3bc022621b2e07b4 Reviewed-by: Fabian Kosmale Reviewed-by: Ahmad Samir (cherry picked from commit 67a71d71093b50d0db172b92aa1b548a1a2bd959) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qobject.cpp | 4 ++-- src/corelib/thread/qthread.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index aef644a0ec7..33361af0f0c 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1738,8 +1738,8 @@ void QObjectPrivate::setThreadData_helper(QThreadData *currentData, QThreadData } // move posted events - int eventsMoved = 0; - for (int i = 0; i < currentData->postEventList.size(); ++i) { + qsizetype eventsMoved = 0; + for (qsizetype i = 0; i < currentData->postEventList.size(); ++i) { const QPostEvent &pe = currentData->postEventList.at(i); if (!pe.event) continue; diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 005666a7426..5e37739a1eb 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -82,7 +82,7 @@ QThreadData::~QThreadData() thread.storeRelease(nullptr); delete t; - for (int i = 0; i < postEventList.size(); ++i) { + for (qsizetype i = 0; i < postEventList.size(); ++i) { const QPostEvent &pe = postEventList.at(i); if (pe.event) { --pe.receiver->d_func()->postedEvents;