From d9da040abb43c7ce8931a833ff79361c30ca86b0 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Mon, 15 Jul 2019 18:55:27 +0000
Subject: [PATCH] remove redundant header inclusions from mkspecs

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 mkspecs/common/mkspecs_posix.h                |  7 ++---
 mkspecs/freebsd/qplatformdefs.h               | 30 ++----------------
 mkspecs/linux/qplatformdefs.h                 | 27 ++--------------
 mkspecs/openbsd/qplatformdefs.h               | 31 +++----------------
 src/core/io/qfilesystemengine_unix.cpp        |  2 ++
 src/core/io/qprocess_unix.cpp                 |  1 +
 src/core/thread/qthread_unix.cpp              |  1 -
 src/core/tools/qdatetime.cpp                  |  1 +
 src/gui/dialogs/qfiledialog.cpp               |  1 +
 src/gui/kernel/qapplication_x11.cpp           |  1 +
 src/network/socket/qnativesocketengine_p.h    |  2 ++
 .../socket/qnativesocketengine_unix.cpp       |  5 +--
 12 files changed, 24 insertions(+), 85 deletions(-)

diff --git a/mkspecs/common/mkspecs_posix.h b/mkspecs/common/mkspecs_posix.h
index 5b323cfa0..14c446f71 100644
--- a/mkspecs/common/mkspecs_posix.h
+++ b/mkspecs/common/mkspecs_posix.h
@@ -34,12 +34,11 @@
 #ifndef Q_POSIX_QPLATFORMDEFS_H
 #define Q_POSIX_QPLATFORMDEFS_H
 
+#include <dirent.h>
 #include <signal.h>
-
+#include <fcntl.h>
 #include <sys/types.h>
-#ifndef QT_NO_SOCKET_H
-#  include <sys/socket.h>
-#endif
+#include <sys/socket.h>
 #include <sys/stat.h>
 
 #if defined(QT_USE_XOPEN_LFS_EXTENSIONS) && defined(QT_LARGEFILE_SUPPORT)
diff --git a/mkspecs/freebsd/qplatformdefs.h b/mkspecs/freebsd/qplatformdefs.h
index 6161579fc..105a55c5e 100644
--- a/mkspecs/freebsd/qplatformdefs.h
+++ b/mkspecs/freebsd/qplatformdefs.h
@@ -35,38 +35,14 @@
 #define QPLATFORMDEFS_H
 
 // Get Qt defines/settings
-
 #include "qconfig.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
 #include <unistd.h>
 
-
 // We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
+#include <stdio.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 
 #include "common/mkspecs_posix.h"
 
@@ -74,7 +50,7 @@
 
 #define QT_OPEN_LARGEFILE       0
 
-#define QT_SNPRINTF		::snprintf
-#define QT_VSNPRINTF		::vsnprintf
+#define QT_SNPRINTF             ::snprintf
+#define QT_VSNPRINTF            ::vsnprintf
 
 #endif // QPLATFORMDEFS_H
diff --git a/mkspecs/linux/qplatformdefs.h b/mkspecs/linux/qplatformdefs.h
index 1abd8758d..7758b5801 100644
--- a/mkspecs/linux/qplatformdefs.h
+++ b/mkspecs/linux/qplatformdefs.h
@@ -35,7 +35,6 @@
 #define QPLATFORMDEFS_H
 
 // Get Qt defines/settings
-
 #include "qconfig.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
@@ -49,29 +48,9 @@
 
 #include <unistd.h>
 
-
 // We are hot - unistd.h should have turned on the specific APIs we requested
-
-#include <features.h>
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
+#include <stdio.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
 #include "common/mkspecs_posix.h"
@@ -85,8 +64,8 @@
 #endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF     ::snprintf
-#define QT_VSNPRINTF        ::vsnprintf
+#define QT_SNPRINTF             ::snprintf
+#define QT_VSNPRINTF            ::vsnprintf
 #endif
 
 #endif // QPLATFORMDEFS_H
diff --git a/mkspecs/openbsd/qplatformdefs.h b/mkspecs/openbsd/qplatformdefs.h
index a405d33e2..07879bf2d 100644
--- a/mkspecs/openbsd/qplatformdefs.h
+++ b/mkspecs/openbsd/qplatformdefs.h
@@ -39,34 +39,11 @@
 #include "qconfig.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
 #include <unistd.h>
 
-
 // We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
+#include <stdio.h> // snprintf, vsnprintf
+#include <sys/socket.h> // socklen_t
 
 #include "common/mkspecs_posix.h"
 
@@ -77,8 +54,8 @@
 // OpenBSD 2.2 - 2.4            int
 // OpenBSD 2.5 - 2.8            socklen_t
 
-#define QT_SNPRINTF		::snprintf
-#define QT_VSNPRINTF		::vsnprintf
+#define QT_SNPRINTF             ::snprintf
+#define QT_VSNPRINTF            ::vsnprintf
 
 // 1003.1c-1995 says on page 38 (2.9.3, paragraph 3) that if _POSIX_THREADS
 // is defined, then _POSIX_THREAD_SAFE_FUNCTIONS must also be defined.
diff --git a/src/core/io/qfilesystemengine_unix.cpp b/src/core/io/qfilesystemengine_unix.cpp
index 2c65fe868..b47abf127 100644
--- a/src/core/io/qfilesystemengine_unix.cpp
+++ b/src/core/io/qfilesystemengine_unix.cpp
@@ -42,6 +42,8 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
+#include <pwd.h>
+#include <grp.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/io/qprocess_unix.cpp b/src/core/io/qprocess_unix.cpp
index 295ddf703..3c7c4a312 100644
--- a/src/core/io/qprocess_unix.cpp
+++ b/src/core/io/qprocess_unix.cpp
@@ -54,6 +54,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/ioctl.h>
 
 //#define QPROCESS_DEBUG
 
diff --git a/src/core/thread/qthread_unix.cpp b/src/core/thread/qthread_unix.cpp
index 0fc1c265e..01bd158be 100644
--- a/src/core/thread/qthread_unix.cpp
+++ b/src/core/thread/qthread_unix.cpp
@@ -228,7 +228,6 @@ void *QThreadPrivate::start(void *arg)
         setCurrentThreadName(thr->metaObject()->className());
     else
         setCurrentThreadName(objectName.toLocal8Bit().constData());
-
 #endif
 
     emit thr->started();
diff --git a/src/core/tools/qdatetime.cpp b/src/core/tools/qdatetime.cpp
index 3f9d5a4d7..6d5a34e88 100644
--- a/src/core/tools/qdatetime.cpp
+++ b/src/core/tools/qdatetime.cpp
@@ -42,6 +42,7 @@
 #include "qmath.h"
 
 #include <time.h>
+#include <sys/time.h>
 
 //#define QDATETIMEPARSER_DEBUG
 #if defined (QDATETIMEPARSER_DEBUG) && !defined(QT_NO_DEBUG_STREAM)
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index e3d821007..64a196b41 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -61,6 +61,7 @@
 #include "ui_qfiledialog.h"
 
 #include <stdlib.h>
+#include <pwd.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 25a4325a9..55e130c90 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -99,6 +99,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <locale.h>
+#include <pwd.h>
 
 #ifdef QT_RX71_MULTITOUCH
 #  include <qsocketnotifier.h>
diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h
index a4fd7e1d9..0096a2f10 100644
--- a/src/network/socket/qnativesocketengine_p.h
+++ b/src/network/socket/qnativesocketengine_p.h
@@ -48,6 +48,8 @@
 #include "qabstractsocketengine_p.h"
 #include "qplatformdefs.h"
 
+#include <netinet/in.h>
+
 QT_BEGIN_NAMESPACE
 
 // Use our own defines and structs which we know are correct
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 2b6bbff83..81d52d7d9 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -47,9 +47,12 @@
 #include "qelapsedtimer.h"
 #include "qvarlengtharray.h"
 #include "qnetworkinterface.h"
+
 #include <time.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
+#include <netinet/tcp.h>
 #ifndef QT_NO_IPV6IFNAME
 #include <net/if.h>
 #endif
@@ -62,8 +65,6 @@
 #include <ctype.h>
 #endif
 
-#include <netinet/tcp.h>
-
 QT_BEGIN_NAMESPACE
 
 #if defined QNATIVESOCKETENGINE_DEBUG