From 1181af9452b8cf41e410e78fd570d15c44bc8fa0 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Thu, 23 Dec 2021 18:10:26 +0100
Subject: [PATCH] Eradicate Q_FOREVER from header files

The qgenericatomic.h occurrences are getting in the way of splitting
up qglobal.h, so inline the define.

Task-number: QTBUG-99313
Change-Id: I0d6e3553c5ed4ac9e426bef2fe07d2672d73c671
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/thread/qgenericatomic.h       | 10 +++++-----
 src/gui/itemmodels/qstandarditemmodel_p.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h
index 65b6974f4d..1fe44c04bf 100644
--- a/src/corelib/thread/qgenericatomic.h
+++ b/src/corelib/thread/qgenericatomic.h
@@ -203,7 +203,7 @@ template <typename BaseClass> struct QGenericAtomicOps
     T fetchAndStoreRelaxed(T &_q_value, X newValue) noexcept
     {
         // implement fetchAndStore on top of testAndSet
-        Q_FOREVER {
+        for (;;) {
             T tmp = loadRelaxed(_q_value);
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, newValue))
                 return tmp;
@@ -238,7 +238,7 @@ template <typename BaseClass> struct QGenericAtomicOps
     T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         // implement fetchAndAdd on top of testAndSet
-        Q_FOREVER {
+        for (;;) {
             T tmp = BaseClass::loadRelaxed(_q_value);
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp + valueToAdd)))
                 return tmp;
@@ -304,7 +304,7 @@ QT_WARNING_POP
     {
         // implement fetchAndAnd on top of testAndSet
         T tmp = BaseClass::loadRelaxed(_q_value);
-        Q_FOREVER {
+        for (;;) {
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp & operand), &tmp))
                 return tmp;
         }
@@ -337,7 +337,7 @@ QT_WARNING_POP
     {
         // implement fetchAndOr on top of testAndSet
         T tmp = BaseClass::loadRelaxed(_q_value);
-        Q_FOREVER {
+        for (;;) {
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp | operand), &tmp))
                 return tmp;
         }
@@ -370,7 +370,7 @@ QT_WARNING_POP
     {
         // implement fetchAndXor on top of testAndSet
         T tmp = BaseClass::loadRelaxed(_q_value);
-        Q_FOREVER {
+        for (;;) {
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp ^ operand), &tmp))
                 return tmp;
         }
diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h
index 8a9a2c8d50..2ce640679a 100644
--- a/src/gui/itemmodels/qstandarditemmodel_p.h
+++ b/src/gui/itemmodels/qstandarditemmodel_p.h
@@ -137,7 +137,7 @@ public:
         // backwards through the children
         int backwardIter = childsLastIndexInParent - 1;
         int forwardIter = childsLastIndexInParent;
-        Q_FOREVER {
+        for (;;) {
             if (forwardIter <= lastChild) {
                 if (children.at(forwardIter) == child) {
                     childsLastIndexInParent = forwardIter;