From bb4e6e477c156a066042e1fbe3c7f27960dfed4d Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sat, 19 Feb 2022 06:38:45 +0100
Subject: [PATCH] [Gui] improvements for PCH builds

---
 src/Gui/Action.cpp            | 3 +--
 src/Gui/DlgPreferencesImp.cpp | 3 +--
 src/Gui/DocumentRecovery.cpp  | 4 ++--
 src/Gui/ProgressBar.cpp       | 3 +--
 src/Gui/Qt4All.h              | 2 ++
 src/Gui/Splashscreen.cpp      | 3 +--
 src/Gui/View3DInventor.cpp    | 7 +++----
 src/Gui/WaitCursor.cpp        | 3 +--
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp
index e733b3f09b..1f0b9c97f3 100644
--- a/src/Gui/Action.cpp
+++ b/src/Gui/Action.cpp
@@ -32,13 +32,12 @@
 # include <QDesktopWidget>
 # include <QEvent>
 # include <QMessageBox>
+# include <QScreen>
 # include <QTimer>
 # include <QToolBar>
 # include <QToolButton>
 #endif
 
-#include <QScreen>
-
 #include <Base/Tools.h>
 #include "Action.h"
 #include "Application.h"
diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp
index 92a1f1f559..472bdb1d89 100644
--- a/src/Gui/DlgPreferencesImp.cpp
+++ b/src/Gui/DlgPreferencesImp.cpp
@@ -30,12 +30,11 @@
 # include <QDesktopWidget>
 # include <QGenericReturnArgument>
 # include <QMessageBox>
+# include <QScreen>
 # include <QScrollArea>
 # include <QScrollBar>
 #endif
 
-#include <QScreen>
-
 #include <Base/Exception.h>
 #include <Base/Console.h>
 #include <App/Application.h>
diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp
index 1e661da01c..c3f22d8292 100644
--- a/src/Gui/DocumentRecovery.cpp
+++ b/src/Gui/DocumentRecovery.cpp
@@ -33,6 +33,8 @@
 # include <QDateTime>
 # include <QDebug>
 # include <QDir>
+# include <QDirIterator>
+# include <QDomDocument>
 # include <QFile>
 # include <QFileInfo>
 # include <QHeaderView>
@@ -64,8 +66,6 @@
 #include <Gui/DlgCheckableMessageBox.h>
 #include <Gui/MainWindow.h>
 
-#include <QDomDocument>
-#include <QDirIterator>
 #include <boost/interprocess/sync/file_lock.hpp>
 
 FC_LOG_LEVEL_INIT("Gui",true,true)
diff --git a/src/Gui/ProgressBar.cpp b/src/Gui/ProgressBar.cpp
index 9225d24bf3..445a369cf2 100644
--- a/src/Gui/ProgressBar.cpp
+++ b/src/Gui/ProgressBar.cpp
@@ -33,10 +33,9 @@
 # include <QThread>
 # include <QTime>
 # include <QTimer>
+# include <QWindow>
 #endif
 
-#include <QWindow>
-
 
 #include "ProgressBar.h"
 #include "ProgressDialog.h"
diff --git a/src/Gui/Qt4All.h b/src/Gui/Qt4All.h
index d64e95250a..d99662d503 100644
--- a/src/Gui/Qt4All.h
+++ b/src/Gui/Qt4All.h
@@ -28,6 +28,7 @@
 // QtCore
 #include <qglobal.h>
 #include <QBuffer>
+#include <QDirIterator>
 #include <QElapsedTimer>
 #include <qeventloop.h>
 #include <qfile.h>
@@ -166,6 +167,7 @@
 // QtWidgets
 #include <QGraphicsScene>
 #include <QGraphicsView>
+#include <QStackedWidget>
 // QtXML
 # include <QDomDocument>
 # include <QDomElement>
diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp
index 66c6a343e2..fd14e96522 100644
--- a/src/Gui/Splashscreen.cpp
+++ b/src/Gui/Splashscreen.cpp
@@ -34,14 +34,13 @@
 # include <QTextBrowser>
 # include <QProcess>
 # include <QProcessEnvironment>
+# include <QScreen>
 # include <QSysInfo>
 # include <QTextStream>
 # include <QWaitCondition>
 # include <Inventor/C/basic.h>
 #endif
 
-#include <QScreen>
-
 #include <LibraryVersions.h>
 #include <zlib.h>
 #include <boost/version.hpp>
diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp
index 8182354db9..47cb6bc16e 100644
--- a/src/Gui/View3DInventor.cpp
+++ b/src/Gui/View3DInventor.cpp
@@ -35,6 +35,7 @@
 # include <QLayout>
 # include <QMdiSubWindow>
 # include <QMessageBox>
+# include <QMimeData>
 # include <QPainter>
 # include <QPrinter>
 # include <QPrintDialog>
@@ -43,7 +44,7 @@
 # include <QStackedWidget>
 # include <QTimer>
 # include <QUrl>
-# include <QMimeData>
+# include <QWindow>
 # include <Inventor/actions/SoWriteAction.h>
 # include <Inventor/actions/SoGetPrimitiveCountAction.h>
 # include <Inventor/nodes/SoDirectionalLight.h>
@@ -56,10 +57,8 @@
 # include <Inventor/fields/SoSFString.h>
 # include <Inventor/fields/SoSFColor.h>
 #endif
-#include <QStackedWidget>
-#include <QtOpenGL.h>
 
-#include <QWindow>
+#include <QtOpenGL.h>
 
 #include <Base/Exception.h>
 #include <Base/Console.h>
diff --git a/src/Gui/WaitCursor.cpp b/src/Gui/WaitCursor.cpp
index 62f14cdb8c..8a5a564006 100644
--- a/src/Gui/WaitCursor.cpp
+++ b/src/Gui/WaitCursor.cpp
@@ -28,13 +28,12 @@
 # include <QDateTime>
 # include <QMessageBox>
 # include <QProgressDialog>
+# include <QWindow>
 # ifdef FC_OS_WIN32
 #   include <windows.h>
 # endif
 #endif
 
-#include <QWindow>
-
 #include "WaitCursor.h"
 
 using namespace Gui;