From 72cf78349369653c7181e3edc173e7e1fb7dafe0 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Thu, 24 Mar 2022 21:09:14 +0100
Subject: [PATCH] Sketcher: include header with export macros

---
 src/Mod/Sketcher/App/ExternalGeometryExtension.h  |  1 +
 src/Mod/Sketcher/App/PreCompiled.h                | 13 -------------
 src/Mod/Sketcher/App/SketchAnalysis.h             |  1 -
 src/Mod/Sketcher/App/SketchGeometryExtension.h    |  1 +
 src/Mod/Sketcher/App/SketchObjectSF.h             |  1 +
 src/Mod/Sketcher/App/SolverGeometryExtension.h    |  1 +
 src/Mod/Sketcher/Gui/PreCompiled.h                | 15 ---------------
 src/Mod/Sketcher/Gui/SketchOrientationDialog.h    |  1 +
 src/Mod/Sketcher/Gui/SoDatumLabel.h               |  1 +
 src/Mod/Sketcher/Gui/SoZoomTranslation.h          |  1 +
 .../Gui/ViewProviderSketchGeometryExtension.h     |  1 +
 src/Mod/Sketcher/Gui/Workbench.h                  |  1 +
 12 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.h b/src/Mod/Sketcher/App/ExternalGeometryExtension.h
index e429fb1dec..1c0422996f 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h
+++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h
@@ -24,6 +24,7 @@
 #define SKETCHER_EXTERNALGEOMETRYEXTENSION_H
 
 #include <Mod/Part/App/Geometry.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 #include <array>
 #include <bitset>
 
diff --git a/src/Mod/Sketcher/App/PreCompiled.h b/src/Mod/Sketcher/App/PreCompiled.h
index c84da9bff5..becbfd4898 100644
--- a/src/Mod/Sketcher/App/PreCompiled.h
+++ b/src/Mod/Sketcher/App/PreCompiled.h
@@ -26,19 +26,6 @@
 
 #include <FCConfig.h>
 
-// Exporting of App classes
-#ifdef FC_OS_WIN32
-# define SketcherExport     __declspec(dllexport)
-# define PartExport         __declspec(dllimport)
-# define PartDesignExport   __declspec(dllimport)
-# define MeshExport         __declspec(dllimport)
-#else // for Linux
-# define SketcherExport
-# define PartExport
-# define PartDesignExport
-# define MeshExport
-#endif
-
 #ifdef _PreComp_
 
 // standard
diff --git a/src/Mod/Sketcher/App/SketchAnalysis.h b/src/Mod/Sketcher/App/SketchAnalysis.h
index 94454a9c7a..ee7936623f 100644
--- a/src/Mod/Sketcher/App/SketchAnalysis.h
+++ b/src/Mod/Sketcher/App/SketchAnalysis.h
@@ -29,7 +29,6 @@
 #include <memory>
 #include <Base/Vector3D.h>
 #include "Analyse.h"
-#include "SketchObject.h"
 
 namespace Sketcher {
 
diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.h b/src/Mod/Sketcher/App/SketchGeometryExtension.h
index 653cc4e0eb..9276c1d849 100644
--- a/src/Mod/Sketcher/App/SketchGeometryExtension.h
+++ b/src/Mod/Sketcher/App/SketchGeometryExtension.h
@@ -24,6 +24,7 @@
 #define SKETCHER_SKETCHGEOMETRYEXTENSION_H
 
 #include <Mod/Part/App/Geometry.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 #include <atomic>
 #include <bitset>
 #include <array>
diff --git a/src/Mod/Sketcher/App/SketchObjectSF.h b/src/Mod/Sketcher/App/SketchObjectSF.h
index 604738e7c2..f2eb6b4b92 100644
--- a/src/Mod/Sketcher/App/SketchObjectSF.h
+++ b/src/Mod/Sketcher/App/SketchObjectSF.h
@@ -29,6 +29,7 @@
 #include <App/PropertyFile.h>
 
 #include <Mod/Part/App/Part2DObject.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 
 namespace Sketcher
 {
diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.h b/src/Mod/Sketcher/App/SolverGeometryExtension.h
index 681c6e8831..aee0130132 100644
--- a/src/Mod/Sketcher/App/SolverGeometryExtension.h
+++ b/src/Mod/Sketcher/App/SolverGeometryExtension.h
@@ -24,6 +24,7 @@
 #define SKETCHER_SOLVERGEOMETRYEXTENSION_H
 
 #include <Mod/Part/App/GeometryExtension.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 
 namespace Sketcher
 {
diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h
index b923ef4298..9321043aa9 100644
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -26,21 +26,6 @@
 
 #include <FCConfig.h>
 
-// Importing of App classes
-#ifdef FC_OS_WIN32
-# define SketcherExport    __declspec(dllimport)
-# define PartExport        __declspec(dllimport)
-# define PartGuiExport     __declspec(dllimport)
-# define SketcherGuiExport __declspec(dllexport)
-#else // for Linux
-# define SketcherExport
-# define PartExport
-# define PartAppExport
-# define PartGuiExport
-# define SketcherGuiExport
-#endif
-
-
 #ifdef _MSC_VER
 #   pragma warning(disable : 4005)
 #endif
diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
index f8629cf2f0..b80289c56d 100644
--- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
+++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
@@ -25,6 +25,7 @@
 
 #include <Base/Placement.h>
 #include <QDialog>
+#include <Mod/Sketcher/SketcherGlobal.h>
 
 namespace SketcherGui {
 
diff --git a/src/Mod/Sketcher/Gui/SoDatumLabel.h b/src/Mod/Sketcher/Gui/SoDatumLabel.h
index a66831a796..8a33870eae 100644
--- a/src/Mod/Sketcher/Gui/SoDatumLabel.h
+++ b/src/Mod/Sketcher/Gui/SoDatumLabel.h
@@ -37,6 +37,7 @@
 #include <Inventor/fields/SoMFVec3f.h>
 #include <Inventor/SbBox3f.h>
 #include <Inventor/fields/SoSFImage.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 
 namespace SketcherGui {
 
diff --git a/src/Mod/Sketcher/Gui/SoZoomTranslation.h b/src/Mod/Sketcher/Gui/SoZoomTranslation.h
index 7ea0e13434..582bf162f3 100644
--- a/src/Mod/Sketcher/Gui/SoZoomTranslation.h
+++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.h
@@ -26,6 +26,7 @@
 #include <Inventor/nodes/SoTranslation.h>
 #include <Inventor/nodes/SoSubNode.h>
 #include <Inventor/nodes/SoTransformation.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 
 namespace SketcherGui {
 
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h
index a192cafe3b..3be807c066 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h
@@ -24,6 +24,7 @@
 #define SKETCHER_VIEWPROVIDERSKETCHGEOMETRYEXTENSION_H
 
 #include <Mod/Part/App/Geometry.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 
 namespace SketcherGui {
 
diff --git a/src/Mod/Sketcher/Gui/Workbench.h b/src/Mod/Sketcher/Gui/Workbench.h
index 59d3bfc9b9..61a57f0ed1 100644
--- a/src/Mod/Sketcher/Gui/Workbench.h
+++ b/src/Mod/Sketcher/Gui/Workbench.h
@@ -27,6 +27,7 @@
 #include <Gui/Workbench.h>
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 
 namespace SketcherGui {