From e11a65813cf15d68ee7324fcc9de52f8c7ccfb67 Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Sat, 20 Jan 2024 20:21:34 -0600
Subject: [PATCH] Materials: Correct PreCompiled.h includes in Gui

---
 src/Mod/Material/Gui/Array2D.cpp          | 3 +--
 src/Mod/Material/Gui/Array3D.cpp          | 3 +--
 src/Mod/Material/Gui/ArrayDelegate.cpp    | 3 +--
 src/Mod/Material/Gui/ArrayModel.cpp       | 3 +--
 src/Mod/Material/Gui/BaseDelegate.cpp     | 3 +--
 src/Mod/Material/Gui/ImageEdit.cpp        | 5 ++---
 src/Mod/Material/Gui/ListDelegate.cpp     | 3 +--
 src/Mod/Material/Gui/ListEdit.cpp         | 3 +--
 src/Mod/Material/Gui/ListModel.cpp        | 3 +--
 src/Mod/Material/Gui/MaterialDelegate.cpp | 3 +--
 src/Mod/Material/Gui/MaterialsEditor.cpp  | 3 +--
 src/Mod/Material/Gui/PreCompiled.h        | 1 +
 src/Mod/Material/Gui/TextEdit.cpp         | 3 +--
 13 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/Mod/Material/Gui/Array2D.cpp b/src/Mod/Material/Gui/Array2D.cpp
index 359160ac13..234c608dfc 100644
--- a/src/Mod/Material/Gui/Array2D.cpp
+++ b/src/Mod/Material/Gui/Array2D.cpp
@@ -21,11 +21,10 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <QMenu>
 #include <QMessageBox>
 #endif
 
-#include <QMenu>
-
 #include <Gui/MainWindow.h>
 
 #include <Mod/Material/App/Exceptions.h>
diff --git a/src/Mod/Material/Gui/Array3D.cpp b/src/Mod/Material/Gui/Array3D.cpp
index 37677a5f62..16cebf5931 100644
--- a/src/Mod/Material/Gui/Array3D.cpp
+++ b/src/Mod/Material/Gui/Array3D.cpp
@@ -21,12 +21,11 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
 #endif
 
-#include <QMenu>
-
 #include <Gui/MainWindow.h>
 
 #include <Mod/Material/App/Exceptions.h>
diff --git a/src/Mod/Material/Gui/ArrayDelegate.cpp b/src/Mod/Material/Gui/ArrayDelegate.cpp
index 4ad6bffe93..fa06605f19 100644
--- a/src/Mod/Material/Gui/ArrayDelegate.cpp
+++ b/src/Mod/Material/Gui/ArrayDelegate.cpp
@@ -30,9 +30,8 @@
 #include <QStringList>
 #include <QTextStream>
 #include <QVariant>
-#endif
-
 #include <limits>
+#endif
 
 #include <App/Application.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Material/Gui/ArrayModel.cpp b/src/Mod/Material/Gui/ArrayModel.cpp
index c7f581316e..5d1dbdd57d 100644
--- a/src/Mod/Material/Gui/ArrayModel.cpp
+++ b/src/Mod/Material/Gui/ArrayModel.cpp
@@ -21,10 +21,9 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#endif
-
 #include <QList>
 #include <QMetaType>
+#endif
 
 #include <Base/Console.h>
 #include <Gui/MainWindow.h>
diff --git a/src/Mod/Material/Gui/BaseDelegate.cpp b/src/Mod/Material/Gui/BaseDelegate.cpp
index d018a80e68..3f75d52fb8 100644
--- a/src/Mod/Material/Gui/BaseDelegate.cpp
+++ b/src/Mod/Material/Gui/BaseDelegate.cpp
@@ -31,9 +31,8 @@
 #include <QSvgRenderer>
 #include <QTextStream>
 #include <QVariant>
-#endif
-
 #include <limits>
+#endif
 
 #include <App/Application.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Material/Gui/ImageEdit.cpp b/src/Mod/Material/Gui/ImageEdit.cpp
index 7ed319554c..b0c21b1258 100644
--- a/src/Mod/Material/Gui/ImageEdit.cpp
+++ b/src/Mod/Material/Gui/ImageEdit.cpp
@@ -21,17 +21,16 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QMessageBox>
-#endif
-
 #include <QBuffer>
 #include <QFile>
 #include <QMenu>
+#include <QMessageBox>
 #include <QPainter>
 #include <QPixmap>
 #include <QString>
 #include <QSvgRenderer>
 #include <QTextStream>
+#endif
 
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
diff --git a/src/Mod/Material/Gui/ListDelegate.cpp b/src/Mod/Material/Gui/ListDelegate.cpp
index 1932cb396f..52f0ca6d2c 100644
--- a/src/Mod/Material/Gui/ListDelegate.cpp
+++ b/src/Mod/Material/Gui/ListDelegate.cpp
@@ -30,9 +30,8 @@
 #include <QStringList>
 #include <QTextStream>
 #include <QVariant>
-#endif
-
 #include <limits>
+#endif
 
 #include <App/Application.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Material/Gui/ListEdit.cpp b/src/Mod/Material/Gui/ListEdit.cpp
index cc1a59bad8..b8df1722a7 100644
--- a/src/Mod/Material/Gui/ListEdit.cpp
+++ b/src/Mod/Material/Gui/ListEdit.cpp
@@ -21,11 +21,10 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <QMenu>
 #include <QMessageBox>
 #endif
 
-#include <QMenu>
-
 #include <Gui/MainWindow.h>
 
 #include <Mod/Material/App/Exceptions.h>
diff --git a/src/Mod/Material/Gui/ListModel.cpp b/src/Mod/Material/Gui/ListModel.cpp
index edf56e2b68..e89a6dcadc 100644
--- a/src/Mod/Material/Gui/ListModel.cpp
+++ b/src/Mod/Material/Gui/ListModel.cpp
@@ -21,9 +21,8 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#endif
-
 #include <QMetaType>
+#endif
 
 #include <Base/Console.h>
 #include <Gui/MainWindow.h>
diff --git a/src/Mod/Material/Gui/MaterialDelegate.cpp b/src/Mod/Material/Gui/MaterialDelegate.cpp
index 38e67cc5e1..d3787e6d46 100644
--- a/src/Mod/Material/Gui/MaterialDelegate.cpp
+++ b/src/Mod/Material/Gui/MaterialDelegate.cpp
@@ -31,9 +31,8 @@
 #include <QSvgRenderer>
 #include <QTextStream>
 #include <QVariant>
-#endif
-
 #include <limits>
+#endif
 
 #include <App/Application.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp
index 3c23ec20f8..d2c3cc2508 100644
--- a/src/Mod/Material/Gui/MaterialsEditor.cpp
+++ b/src/Mod/Material/Gui/MaterialsEditor.cpp
@@ -31,9 +31,8 @@
 #include <QStringList>
 #include <QTextStream>
 #include <QVariant>
-#endif
-
 #include <limits>
+#endif
 
 #include <App/Application.h>
 #include <App/License.h>
diff --git a/src/Mod/Material/Gui/PreCompiled.h b/src/Mod/Material/Gui/PreCompiled.h
index 36cb312a6f..9d0d6c1884 100644
--- a/src/Mod/Material/Gui/PreCompiled.h
+++ b/src/Mod/Material/Gui/PreCompiled.h
@@ -44,6 +44,7 @@
 // standard
 #include <cfloat>
 #include <cmath>
+#include <limits>
 
 // STL
 #include <algorithm>
diff --git a/src/Mod/Material/Gui/TextEdit.cpp b/src/Mod/Material/Gui/TextEdit.cpp
index 93f46b77c3..95c1558855 100644
--- a/src/Mod/Material/Gui/TextEdit.cpp
+++ b/src/Mod/Material/Gui/TextEdit.cpp
@@ -21,11 +21,10 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <QMenu>
 #include <QMessageBox>
 #endif
 
-#include <QMenu>
-
 #include <Gui/MainWindow.h>
 
 #include <Mod/Material/App/Exceptions.h>