From bcd1ebe537ca0a428a90449a8e5a510ef2b60d4a Mon Sep 17 00:00:00 2001
From: AgCaliva <ramiel1390@gmail.com>
Date: Sat, 9 Sep 2023 04:58:38 -0300
Subject: [PATCH] fixing DOMDocument redefinition on windows

---
 src/Mod/Fem/Gui/TaskFemConstraint.cpp          | 4 +++-
 src/Mod/Fem/Gui/TaskPostBoxes.cpp              | 6 ++++--
 src/Mod/Part/Gui/ViewProviderGridExtension.cpp | 6 ++++--
 src/Mod/Path/Gui/AppPathGui.cpp                | 3 ++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.cpp b/src/Mod/Fem/Gui/TaskFemConstraint.cpp
index 00d103a0c3..4b07bac81d 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraint.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraint.cpp
@@ -32,10 +32,12 @@
 # include <boost/lexical_cast.hpp> // OvG conversion between string and int etc.
 #endif
 
+#include <Gui/Command.h>
+
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/Command.h>
+
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
index e1851748a5..26b7d36f40 100644
--- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp
+++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
@@ -36,6 +36,9 @@
 # include <QToolTip>
 #endif
 
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
+
 #include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/UnitsApi.h>
@@ -45,8 +48,7 @@
 #include <Gui/CommandT.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
+
 #include <Gui/Inventor/MarkerBitmaps.h>
 #include <Mod/Fem/App/FemPostPipeline.h>
 
diff --git a/src/Mod/Part/Gui/ViewProviderGridExtension.cpp b/src/Mod/Part/Gui/ViewProviderGridExtension.cpp
index ed298adff3..fed8af47ae 100644
--- a/src/Mod/Part/Gui/ViewProviderGridExtension.cpp
+++ b/src/Mod/Part/Gui/ViewProviderGridExtension.cpp
@@ -38,6 +38,9 @@
 # include <QApplication>
 #endif
 
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
+
 #include <Base/Parameter.h>
 #include <App/Application.h>
 #include <Mod/Part/App/PropertyTopoShape.h>
@@ -45,8 +48,7 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/MDIView.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
+
 #include <Gui/ViewProvider.h>
 #include <Gui/ViewProviderDocumentObject.h>
 
diff --git a/src/Mod/Path/Gui/AppPathGui.cpp b/src/Mod/Path/Gui/AppPathGui.cpp
index 8b3c0641c2..2f5699c46f 100644
--- a/src/Mod/Path/Gui/AppPathGui.cpp
+++ b/src/Mod/Path/Gui/AppPathGui.cpp
@@ -25,7 +25,7 @@
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
-#include <Gui/Application.h>
+
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>
 
@@ -34,6 +34,7 @@
 #include "ViewProviderPath.h"
 #include "ViewProviderPathCompound.h"
 #include "ViewProviderPathShape.h"
+#include <Gui/Application.h>
 
 
 // use a different name to CreateCommand()