diff --git a/src/Mod/Sketcher/App/PreCompiled.h b/src/Mod/Sketcher/App/PreCompiled.h index bf41f16fa2..3a5014fac5 100644 --- a/src/Mod/Sketcher/App/PreCompiled.h +++ b/src/Mod/Sketcher/App/PreCompiled.h @@ -28,27 +28,60 @@ #ifdef _PreComp_ // standard -#include -#include -#include #include -#include -#include +#include #include -#include +#include #include -#include #include -// QT +// Qt #include // Boost #include #include -// Opencascade -#include +// OpenCasCade +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #elif defined(FC_OS_WIN32) #ifndef NOMINMAX diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.cpp b/src/Mod/Sketcher/App/PropertyConstraintList.cpp index 0a40474f1a..244513f6cc 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.cpp +++ b/src/Mod/Sketcher/App/PropertyConstraintList.cpp @@ -20,33 +20,27 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ -# include +# include #endif -/// Here the FreeCAD includes sorted by Base,App,Gui...... - -#include +#include +#include +#include #include #include #include -#include -#include -#include -#include #include "PropertyConstraintList.h" #include "ConstraintPy.h" + using namespace App; using namespace Base; using namespace std; using namespace Sketcher; - //************************************************************************** // PropertyConstraintList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h index ee80911d90..f8590940c0 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.h +++ b/src/Mod/Sketcher/App/PropertyConstraintList.h @@ -20,21 +20,21 @@ * * ***************************************************************************/ - #ifndef APP_PropertyConstraintList_H #define APP_PropertyConstraintList_H -// Std. configurations - - -#include #include -#include -#include -#include "Constraint.h" +#include + #include #include +#include +#include + +#include "Constraint.h" + + namespace Base { class Writer; } diff --git a/src/Mod/Sketcher/App/PythonConverter.cpp b/src/Mod/Sketcher/App/PythonConverter.cpp index cbde8faa48..53196e3bb9 100644 --- a/src/Mod/Sketcher/App/PythonConverter.cpp +++ b/src/Mod/Sketcher/App/PythonConverter.cpp @@ -26,11 +26,8 @@ #endif // #ifndef _PreComp_ #include - -#include -#include - #include +#include #include "PythonConverter.h" diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp index 30f2414f6f..6ee720b5b5 100644 --- a/src/Mod/Sketcher/App/Sketch.cpp +++ b/src/Mod/Sketcher/App/Sketch.cpp @@ -20,47 +20,43 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include +# include + # include +# include # include # include -# include # include +# include # include # include -# include -# include -# include #endif -#include -#include -#include -#include #include +#include +#include +#include +#include #include - -#include -#include #include #include +#include +#include +#include #include #include #include -#include -#include -#include #include -#include +#include +#include "Sketch.h" #include "Constraint.h" - #include "GeometryFacade.h" #include "SolverGeometryExtension.h" -#include "Sketch.h" //#define DEBUG_BLOCK_CONSTRAINT #undef DEBUG_BLOCK_CONSTRAINT diff --git a/src/Mod/Sketcher/App/Sketch.h b/src/Mod/Sketcher/App/Sketch.h index eafc21d86b..54f7e1b862 100644 --- a/src/Mod/Sketcher/App/Sketch.h +++ b/src/Mod/Sketcher/App/Sketch.h @@ -23,17 +23,14 @@ #ifndef SKETCHER_SKETCH_H #define SKETCHER_SKETCH_H -#include -#include -#include -#include -#include "GeoList.h" -#include "Constraint.h" - -#include "planegcs/GCS.h" - #include #include +#include + +#include "Constraint.h" +#include "GeoList.h" +#include "planegcs/GCS.h" + namespace Sketcher { diff --git a/src/Mod/Sketcher/App/SketchAnalysis.cpp b/src/Mod/Sketcher/App/SketchAnalysis.cpp index ccb2bddb35..3b5b0dd31c 100644 --- a/src/Mod/Sketcher/App/SketchAnalysis.cpp +++ b/src/Mod/Sketcher/App/SketchAnalysis.cpp @@ -21,34 +21,27 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ -# include +# include + # include # include # include -# include -# include # include -# include # include -# include +# include # include -# include -# include +# include #endif -#include #include - -#include -#include -#include -#include +#include #include "SketchAnalysis.h" +#include "GeometryFacade.h" +#include "SketchObject.h" + using namespace Sketcher; diff --git a/src/Mod/Sketcher/App/SketchAnalysis.h b/src/Mod/Sketcher/App/SketchAnalysis.h index bb6bf97abf..b22acc5a33 100644 --- a/src/Mod/Sketcher/App/SketchAnalysis.h +++ b/src/Mod/Sketcher/App/SketchAnalysis.h @@ -21,15 +21,17 @@ * * ***************************************************************************/ - #ifndef SKETCHER_SKETCHANALYSIS_H #define SKETCHER_SKETCHANALYSIS_H -#include #include +#include + #include + #include "Analyse.h" + namespace Sketcher { class SketchObject; diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.cpp b/src/Mod/Sketcher/App/SketchGeometryExtension.cpp index cc988feeb9..b8f6663467 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtension.cpp +++ b/src/Mod/Sketcher/App/SketchGeometryExtension.cpp @@ -22,15 +22,14 @@ #include "PreCompiled.h" -#include #include - +#include #include #include "SketchGeometryExtension.h" -using namespace Sketcher; +using namespace Sketcher; //---------- Geometry Extension constexpr std::array SketchGeometryExtension::internaltype2str; diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.h b/src/Mod/Sketcher/App/SketchGeometryExtension.h index b0e9555d31..5cd31b639c 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtension.h +++ b/src/Mod/Sketcher/App/SketchGeometryExtension.h @@ -23,11 +23,13 @@ #ifndef SKETCHER_SKETCHGEOMETRYEXTENSION_H #define SKETCHER_SKETCHGEOMETRYEXTENSION_H -#include -#include +#include #include #include -#include + +#include +#include + namespace Sketcher { diff --git a/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp b/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp index 357ae797a2..b35dda0740 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp @@ -20,18 +20,12 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -//#ifndef _PreComp_ -//# include -//#endif - -#include -#include "SketchObject.h" #include "SketchGeometryExtensionPy.h" #include "SketchGeometryExtensionPy.cpp" + using namespace Sketcher; // returns a string which represents the object e.g. when printed in python diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index caab1f2240..2d60c12fcc 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -22,43 +22,39 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include -# include -# include -# include -# include +# include +# include + +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include # include # include # include # include # include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include +# include # include -# include -# include -# include +# include +# include +# include +# include +# include +# include #endif #include @@ -69,23 +65,18 @@ #include #include #include -#include +#include #include #include -#include #include - -#include -#include +#include #include +#include #include -#include -#include -#include -#include - #include "SketchObject.h" +#include "SketchObjectPy.h" +#include "SolverGeometryExtension.h" #undef DEBUG diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h index 51b2b990c3..b7eb2143ea 100644 --- a/src/Mod/Sketcher/App/SketchObject.h +++ b/src/Mod/Sketcher/App/SketchObject.h @@ -23,28 +23,20 @@ #ifndef SKETCHER_SKETCHOBJECT_H #define SKETCHER_SKETCHOBJECT_H -#include -#include #include +#include #include - #include #include #include - #include -#include "GeometryFacade.h" - #include "Analyse.h" - +#include "GeoEnum.h" +#include "GeoList.h" +#include "GeometryFacade.h" #include "Sketch.h" -#include "SketchGeometryExtension.h" - -#include "GeoEnum.h" - -#include "GeoList.h" namespace Sketcher { diff --git a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp index c250390dcc..0822210692 100644 --- a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp @@ -22,32 +22,28 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include # include +# include + +# include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include +#include +#include +#include +#include +#include +#include // inclusion of the generated files (generated out of SketchObjectSFPy.xml) #include "SketchObjectPy.h" #include "SketchObjectPy.cpp" // other python types #include "ConstraintPy.h" -#include "GeometryFacade.h" #include "GeometryFacadePy.h" + using namespace Sketcher; // returns a string which represents the object e.g. when printed in python @@ -56,7 +52,6 @@ std::string SketchObjectPy::representation() const return ""; } - PyObject* SketchObjectPy::solve(PyObject *args) { if (!PyArg_ParseTuple(args, "")) diff --git a/src/Mod/Sketcher/App/SketchObjectSF.cpp b/src/Mod/Sketcher/App/SketchObjectSF.cpp index 5356c1334b..e353c67079 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.cpp +++ b/src/Mod/Sketcher/App/SketchObjectSF.cpp @@ -20,23 +20,17 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - +#include #include "SketchObjectSF.h" -#include using namespace Sketcher; - PROPERTY_SOURCE(Sketcher::SketchObjectSF, Part::Part2DObject) - SketchObjectSF::SketchObjectSF() { ADD_PROPERTY_TYPE(SketchFlatFile,(nullptr),"",(App::PropertyType)(App::Prop_None), diff --git a/src/Mod/Sketcher/App/SketchObjectSF.h b/src/Mod/Sketcher/App/SketchObjectSF.h index a25fbc1ff5..a9d60cd601 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.h +++ b/src/Mod/Sketcher/App/SketchObjectSF.h @@ -20,21 +20,17 @@ * * ***************************************************************************/ - - #ifndef SKETCH_SKETCHOBJECTSF_H #define SKETCH_SKETCHOBJECTSF_H -#include #include - #include #include + namespace Sketcher { - class SketchObjectSF :public Part::Part2DObject { PROPERTY_HEADER_WITH_OVERRIDE(Sketcher::SketchObjectSF); diff --git a/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp index 18a0d89b6c..ac695a9814 100644 --- a/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp @@ -22,12 +22,11 @@ #include "PreCompiled.h" -#include "Mod/Sketcher/App/SketchObjectSF.h" - // inclusion of the generated files (generated out of SketchObjectSFPy.xml) #include "SketchObjectSFPy.h" #include "SketchObjectSFPy.cpp" + using namespace Sketcher; // returns a string which represents the object e.g. when printed in python @@ -36,8 +35,6 @@ std::string SketchObjectSFPy::representation() const return ""; } - - PyObject *SketchObjectSFPy::getCustomAttributes(const char* /*attr*/) const { return nullptr; @@ -47,5 +44,3 @@ int SketchObjectSFPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj* { return 0; } - - diff --git a/src/Mod/Sketcher/App/SketchPyImp.cpp b/src/Mod/Sketcher/App/SketchPyImp.cpp index 3cb17e82ca..cf089498e3 100644 --- a/src/Mod/Sketcher/App/SketchPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchPyImp.cpp @@ -23,19 +23,14 @@ #include "PreCompiled.h" #include - -#include #include #include -#include - -#include "Sketch.h" -#include "Constraint.h" -#include "ConstraintPy.h" // inclusion of the generated files (generated out of SketchPy.xml) #include "SketchPy.h" #include "SketchPy.cpp" +#include "ConstraintPy.h" + using namespace Sketcher; using namespace Part; diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.cpp b/src/Mod/Sketcher/App/SolverGeometryExtension.cpp index 8d79c6ccea..6dd66efc4b 100644 --- a/src/Mod/Sketcher/App/SolverGeometryExtension.cpp +++ b/src/Mod/Sketcher/App/SolverGeometryExtension.cpp @@ -23,13 +23,12 @@ #include "PreCompiled.h" #include - #include #include "SolverGeometryExtension.h" -using namespace Sketcher; +using namespace Sketcher; //---------- Geometry Extension TYPESYSTEM_SOURCE(Sketcher::SolverGeometryExtension,Part::GeometryExtension) diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.h b/src/Mod/Sketcher/App/SolverGeometryExtension.h index ddd6728a94..e2bc799df7 100644 --- a/src/Mod/Sketcher/App/SolverGeometryExtension.h +++ b/src/Mod/Sketcher/App/SolverGeometryExtension.h @@ -23,12 +23,12 @@ #ifndef SKETCHER_SOLVERGEOMETRYEXTENSION_H #define SKETCHER_SOLVERGEOMETRYEXTENSION_H +#include #include #include #include "GeoEnum.h" -#include namespace Sketcher {