From 83139a4baa3fb3ed77bbc4d5bf3fce178be1aae2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 15 Oct 2024 10:14:10 -0700
Subject: [PATCH] QThread: reorganize and clean up #includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removing unused headers and sorting them in the standard "mine", "Qt's"
and "other" order. Sorted by file name, not complete path.

Change-Id: I6cbcdb5887175bdd7618fffd0627222ff4718efc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
---
 src/corelib/thread/qthread.cpp      | 13 ++++---------
 src/corelib/thread/qthread_unix.cpp | 28 ++++++++++------------------
 src/corelib/thread/qthread_win.cpp  |  8 +++-----
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 0f939abf156..870689f4d0c 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -3,18 +3,13 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qthread.h"
-#include "qthreadstorage.h"
-#include "qmutex.h"
-#include "qreadwritelock.h"
+#include "qthread_p.h"
+
 #include "qabstracteventdispatcher.h"
 #include "qbindingstorage.h"
-
-#include <qeventloop.h>
-
-#include "qthread_p.h"
 #include "private/qcoreapplication_p.h"
-
-#include <limits>
+#include "qeventloop.h"
+#include "qmutex.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index c82ba32b505..a540687dcd1 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -3,33 +3,25 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qthread.h"
-
-#include "qplatformdefs.h"
+#include "qthread_p.h"
 
 #include <private/qcoreapplication_p.h>
 #include <private/qcore_unix_p.h>
+#include "qdebug.h"
+#include "qthreadstorage.h"
 #include <private/qtools_p.h>
 
-#if defined(Q_OS_DARWIN)
-#  include <private/qeventdispatcher_cf_p.h>
-#elif defined(Q_OS_WASM)
-#    include <private/qeventdispatcher_wasm_p.h>
+#if defined(Q_OS_WASM)
+#  include <private/qeventdispatcher_wasm_p.h>
 #else
-#  if !defined(QT_NO_GLIB)
-#    include "../kernel/qeventdispatcher_glib_p.h"
+#  include <private/qeventdispatcher_unix_p.h>
+#  if defined(Q_OS_DARWIN)
+#    include <private/qeventdispatcher_cf_p.h>
+#  elif !defined(QT_NO_GLIB)
+#    include <private/qeventdispatcher_glib_p.h>
 #  endif
 #endif
 
-#if !defined(Q_OS_WASM)
-#  include <private/qeventdispatcher_unix_p.h>
-#endif
-
-#include "qthreadstorage.h"
-
-#include "qthread_p.h"
-
-#include "qdebug.h"
-
 #ifdef __GLIBCXX__
 #include <cxxabi.h>
 #endif
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 27f0cdf1c9a..6d8d630f2cf 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -3,14 +3,12 @@
 
 #include "qthread.h"
 #include "qthread_p.h"
-#include "qthreadstorage.h"
-#include "qmutex.h"
-
-#include <qcoreapplication.h>
-#include <qpointer.h>
 
+#include "qcoreapplication.h"
 #include <private/qcoreapplication_p.h>
 #include <private/qeventdispatcher_win_p.h>
+#include "qmutex.h"
+#include "qthreadstorage.h"
 
 #include <qt_windows.h>