From 1cbecdf122d55096ff6b4874b571904d99b4de55 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 4 Mar 2022 17:27:53 +0100
Subject: [PATCH] App: use forward declaration to reduce compile time

---
 src/App/DocumentObject.cpp                       | 1 +
 src/App/PropertyExpressionEngine.h               | 3 ++-
 src/App/PropertyLinks.cpp                        | 1 +
 src/Gui/CommandDoc.cpp                           | 1 +
 src/Gui/DlgPropertyLink.cpp                      | 1 +
 src/Gui/propertyeditor/PropertyItem.cpp          | 1 +
 src/Mod/Part/Gui/DlgFilletEdges.h                | 3 +++
 src/Mod/Sketcher/App/SketchObject.cpp            | 5 +++--
 src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp | 1 +
 9 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/App/DocumentObject.cpp b/src/App/DocumentObject.cpp
index ca3835c4c4..8c65df9430 100644
--- a/src/App/DocumentObject.cpp
+++ b/src/App/DocumentObject.cpp
@@ -35,6 +35,7 @@
 #include "DocumentObjectExtension.h"
 #include "DocumentObjectGroup.h"
 #include "GeoFeatureGroupExtension.h"
+#include "ObjectIdentifier.h"
 #include "PropertyExpressionEngine.h"
 #include "PropertyLinks.h"
 
diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h
index caa0fe18d4..ab450e6956 100644
--- a/src/App/PropertyExpressionEngine.h
+++ b/src/App/PropertyExpressionEngine.h
@@ -28,7 +28,7 @@
 #include <boost_signals2.hpp>
 #include <boost_graph_adjacency_list.hpp>
 #include <boost/graph/topological_sort.hpp>
-#include <App/Expression.h>
+#include <App/PropertyLinks.h>
 #include <set>
 
 namespace Base {
@@ -42,6 +42,7 @@ class DocumentObject;
 class DocumentObjectExecReturn;
 class ObjectIdentifier;
 class Expression;
+using ExpressionPtr = std::unique_ptr<Expression>;
 
 class AppExport PropertyExpressionContainer : public App::PropertyXLinkContainer
 {
diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp
index 83728b086d..5c8d85eb43 100644
--- a/src/App/PropertyLinks.cpp
+++ b/src/App/PropertyLinks.cpp
@@ -38,6 +38,7 @@
 #include "Document.h"
 #include "DocumentObject.h"
 #include "DocumentObjectPy.h"
+#include "ObjectIdentifier.h"
 
 
 FC_LOG_LEVEL_INIT("PropertyLinks",true,true)
diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp
index 1b5c14f3c0..19956b0a3e 100644
--- a/src/Gui/CommandDoc.cpp
+++ b/src/Gui/CommandDoc.cpp
@@ -36,6 +36,7 @@
 
 #include <App/AutoTransaction.h>
 #include <App/DocumentObject.h>
+#include <App/Expression.h>
 #include <App/GeoFeature.h>
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
diff --git a/src/Gui/DlgPropertyLink.cpp b/src/Gui/DlgPropertyLink.cpp
index 5d8cd40cd6..511aba9878 100644
--- a/src/Gui/DlgPropertyLink.cpp
+++ b/src/Gui/DlgPropertyLink.cpp
@@ -39,6 +39,7 @@
 #include <App/DocumentObject.h>
 #include <App/GeoFeature.h>
 #include <App/DocumentObserver.h>
+#include <App/ObjectIdentifier.h>
 #include <App/PropertyPythonObject.h>
 
 #include "Document.h"
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
index b6535e836b..1b270b467f 100644
--- a/src/Gui/propertyeditor/PropertyItem.cpp
+++ b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -39,6 +39,7 @@
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
+#include <App/Expression.h>
 #include <App/PropertyGeo.h>
 #include <App/PropertyFile.h>
 #include <App/PropertyUnits.h>
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.h b/src/Mod/Part/Gui/DlgFilletEdges.h
index 4f97cd96e2..e4146987a6 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.h
+++ b/src/Mod/Part/Gui/DlgFilletEdges.h
@@ -30,6 +30,9 @@
 #include <QStandardItemModel>
 #include <QItemDelegate>
 
+namespace Base {
+    class Quantity;
+}
 namespace Part { 
     class FilletBase;
     class Fillet;
diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp
index e64a9e1587..128aba4928 100644
--- a/src/Mod/Sketcher/App/SketchObject.cpp
+++ b/src/Mod/Sketcher/App/SketchObject.cpp
@@ -65,7 +65,10 @@
 
 #include <App/Application.h>
 #include <App/Document.h>
+#include <App/Expression.h>
 #include <App/FeaturePythonPyImp.h>
+#include <App/ObjectIdentifier.h>
+#include <App/OriginFeature.h>
 #include <App/Part.h>
 #include <Base/Writer.h>
 #include <Base/Reader.h>
@@ -73,8 +76,6 @@
 #include <Base/Console.h>
 #include <Base/Vector3D.h>
 
-#include <App/OriginFeature.h>
-
 #include <Mod/Part/App/Geometry.h>
 #include <Mod/Part/App/DatumFeature.h>
 #include <Mod/Part/App/BodyBase.h>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
index a00897a8a5..dba467b56c 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
@@ -48,6 +48,7 @@
 #include <Base/Tools.h>
 #include <App/Application.h>
 #include <App/Document.h>
+#include <App/Expression.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>