diff --git a/src/Mod/Import/App/AppImport.cpp b/src/Mod/Import/App/AppImport.cpp index 1d6cd82618..1ddba87ec9 100644 --- a/src/Mod/Import/App/AppImport.cpp +++ b/src/Mod/Import/App/AppImport.cpp @@ -21,15 +21,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif #include #include -#include "StepShapePy.h" + #include "StepShape.h" +#include "StepShapePy.h" + namespace Import { extern PyObject* initModule(); diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp index 0eda0a087d..64e2dc34ff 100644 --- a/src/Mod/Import/App/AppImportPy.cpp +++ b/src/Mod/Import/App/AppImportPy.cpp @@ -26,21 +26,12 @@ #endif #ifndef _PreComp_ # include -#if defined(__clang__) -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wextra-semi" -#endif -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include +# if defined(__clang__) +# pragma clang diagnostic pop +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wextra-semi" +# endif +# include # include # include # include @@ -48,39 +39,33 @@ # include # include # include -# include -# include -# include -# include # include -#if defined(__clang__) -# pragma clang diagnostic pop -#endif +# include +# include +# include +# include +# include +# include +# include +# include #endif -#include -#include - -#include "ImportOCAF2.h" -//#include "ImportOCAFAssembly.h" -#include -#include #include #include #include -#include -#include -#include +#include +#include "dxf/ImpExpDxf.h" +#include #include #include #include -#include -#include +#include #include -#include #include +#include + +#include "ImportOCAF2.h" -#include "dxf/ImpExpDxf.h" namespace Import { diff --git a/src/Mod/Import/App/ExportOCAF.cpp b/src/Mod/Import/App/ExportOCAF.cpp index 3bff495ec4..f9f436a409 100644 --- a/src/Mod/Import/App/ExportOCAF.cpp +++ b/src/Mod/Import/App/ExportOCAF.cpp @@ -20,77 +20,37 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #if defined(__MINGW32__) # define WNT // avoid conflict with GUID #endif #ifndef _PreComp_ -# include +# include # include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include # include # include // for Precision::Confusion() -# 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 -#include #include -#include -#include -#include -#include -#include "ExportOCAF.h" -#include -#include -#include -#include - #include -#include +#include +#include +#include + +#include "ExportOCAF.h" + #if OCC_VERSION_HEX >= 0x070500 // See https://dev.opencascade.org/content/occt-3d-viewer-becomes-srgb-aware diff --git a/src/Mod/Import/App/ExportOCAF.h b/src/Mod/Import/App/ExportOCAF.h index 8a70aa73ea..7a3f6d9532 100644 --- a/src/Mod/Import/App/ExportOCAF.h +++ b/src/Mod/Import/App/ExportOCAF.h @@ -20,23 +20,19 @@ * * ***************************************************************************/ - #ifndef IMPORT_EXPORTOCAF_H #define IMPORT_EXPORTOCAF_H +#include +#include +#include +#include +#include + #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + #include diff --git a/src/Mod/Import/App/FeatureImportIges.cpp b/src/Mod/Import/App/FeatureImportIges.cpp index 3395510799..bc7932a639 100644 --- a/src/Mod/Import/App/FeatureImportIges.cpp +++ b/src/Mod/Import/App/FeatureImportIges.cpp @@ -20,20 +20,17 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include -# include # include # include -# include #endif #include #include #include + #include "FeatureImportIges.h" diff --git a/src/Mod/Import/App/FeatureImportIges.h b/src/Mod/Import/App/FeatureImportIges.h index 680b10a35e..74175a7b0c 100644 --- a/src/Mod/Import/App/FeatureImportIges.h +++ b/src/Mod/Import/App/FeatureImportIges.h @@ -20,18 +20,15 @@ * * ***************************************************************************/ - - #ifndef __FeatureImportIges_H__ #define __FeatureImportIges_H__ - #include + namespace Import { - class FeatureImportIges :public Part::Feature { public: diff --git a/src/Mod/Import/App/FeatureImportStep.cpp b/src/Mod/Import/App/FeatureImportStep.cpp index 6574cb99ea..8251bc140d 100644 --- a/src/Mod/Import/App/FeatureImportStep.cpp +++ b/src/Mod/Import/App/FeatureImportStep.cpp @@ -19,20 +19,18 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include -# include # include # include -# include +# include #endif #include #include + #include "FeatureImportStep.h" diff --git a/src/Mod/Import/App/FeatureImportStep.h b/src/Mod/Import/App/FeatureImportStep.h index 9ac1e8b778..0fb5038881 100644 --- a/src/Mod/Import/App/FeatureImportStep.h +++ b/src/Mod/Import/App/FeatureImportStep.h @@ -20,18 +20,15 @@ * * ***************************************************************************/ - - #ifndef __FeatureImportStep_H__ #define __FeatureImportStep_H__ - #include + namespace Import { - class FeatureImportStep :public Part::Feature { public: diff --git a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp index 978674db4e..b904d9c815 100644 --- a/src/Mod/Import/App/ImportOCAF.cpp +++ b/src/Mod/Import/App/ImportOCAF.cpp @@ -20,86 +20,46 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #if defined(__MINGW32__) # define WNT // avoid conflict with GUID #endif #ifndef _PreComp_ -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include +# include # include // for Precision::Confusion() +# 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 -#include -#include #include #include -#include -#include -#include -#include +#include +#include #include -#include "ImportOCAF.h" -#include -#include -#include -#include -#include +#include "ImportOCAF.h" + #ifdef HAVE_TBB -#include -#include -#include +# include +# include +# include #endif using namespace Import; diff --git a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h index b433db69f6..62e68be9c0 100644 --- a/src/Mod/Import/App/ImportOCAF.h +++ b/src/Mod/Import/App/ImportOCAF.h @@ -20,27 +20,26 @@ * * ***************************************************************************/ - #ifndef IMPORT_IMPORTOCAF_H #define IMPORT_IMPORTOCAF_H -#include -#include -#include -#include -#include -#include #include -#include -#include #include +#include +#include #include #include -#include + +#include +#include +#include +#include +#include + #include -#include #include + class TDF_Label; class TopLoc_Location; diff --git a/src/Mod/Import/App/ImportOCAF2.cpp b/src/Mod/Import/App/ImportOCAF2.cpp index 6740e894d8..2fe75b6521 100644 --- a/src/Mod/Import/App/ImportOCAF2.cpp +++ b/src/Mod/Import/App/ImportOCAF2.cpp @@ -25,55 +25,45 @@ # define WNT // avoid conflict with GUID #endif #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 #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 +#include +#include +#include + #include "ImportOCAF2.h" + #if OCC_VERSION_HEX >= 0x070500 // See https://dev.opencascade.org/content/occt-3d-viewer-becomes-srgb-aware # define OCC_COLOR_SPACE Quantity_TOC_sRGB diff --git a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h index d2936da8df..f88aa70a38 100644 --- a/src/Mod/Import/App/ImportOCAF2.h +++ b/src/Mod/Import/App/ImportOCAF2.h @@ -23,21 +23,22 @@ #ifndef IMPORT_IMPORTOCAF2_H #define IMPORT_IMPORTOCAF2_H -#include -#include -#include -#include -#include #include -#include -#include #include +#include +#include #include #include -#include -#include -#include + +#include +#include +#include +#include +#include + #include +#include + #include "ImportOCAF.h" #include "ExportOCAF.h" diff --git a/src/Mod/Import/App/ImportOCAFAssembly.cpp b/src/Mod/Import/App/ImportOCAFAssembly.cpp index 084124a7ef..4e8e0458da 100644 --- a/src/Mod/Import/App/ImportOCAFAssembly.cpp +++ b/src/Mod/Import/App/ImportOCAFAssembly.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #if defined(__MINGW32__) # define WNT // avoid conflict with GUID @@ -28,46 +27,26 @@ #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 #endif -#include "ImportOCAFAssembly.h" -#include #include #include -#include +#include #include -#include -#include -#include + +#include "ImportOCAFAssembly.h" using namespace Import; diff --git a/src/Mod/Import/App/ImportOCAFAssembly.h b/src/Mod/Import/App/ImportOCAFAssembly.h index 296e5ab849..b88470de1e 100644 --- a/src/Mod/Import/App/ImportOCAFAssembly.h +++ b/src/Mod/Import/App/ImportOCAFAssembly.h @@ -20,18 +20,20 @@ * * ***************************************************************************/ - #ifndef IMPORT_ImportOCAFAssembly_H #define IMPORT_ImportOCAFAssembly_H -#include -#include #include -#include -#include #include +#include +#include #include + +#include + #include +#include + class TDF_Label; class TopLoc_Location; diff --git a/src/Mod/Import/App/PreCompiled.h b/src/Mod/Import/App/PreCompiled.h index 22bb5c0235..93ce49e60f 100644 --- a/src/Mod/Import/App/PreCompiled.h +++ b/src/Mod/Import/App/PreCompiled.h @@ -51,7 +51,7 @@ // OpenCasCade ===================================================================================== // Base -#include "OpenCascadeAll.h" +#include #endif //_PreComp_ diff --git a/src/Mod/Import/App/StepShape.cpp b/src/Mod/Import/App/StepShape.cpp index a27ff781b6..91d6815a09 100644 --- a/src/Mod/Import/App/StepShape.cpp +++ b/src/Mod/Import/App/StepShape.cpp @@ -20,24 +20,23 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include #endif +#include +#include + +#include +#include +#include +#include +#include +#include + #include "StepShape.h" -# include -# include -# include -# include -# include -# include -# include - -# include -# include using namespace Import; diff --git a/src/Mod/Import/App/StepShapePyImp.cpp b/src/Mod/Import/App/StepShapePyImp.cpp index a6f625f429..a5550b4909 100644 --- a/src/Mod/Import/App/StepShapePyImp.cpp +++ b/src/Mod/Import/App/StepShapePyImp.cpp @@ -1,8 +1,27 @@ +/*************************************************************************** + * Copyright (c) 2014 Jürgen Riegel * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ #include "PreCompiled.h" -#include "Mod/Import/App/StepShape.h" - // inclusion of the generated files (generated out of StepShapePy.xml) #include "StepShapePy.h" #include "StepShapePy.cpp" diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.cpp b/src/Mod/Import/App/dxf/ImpExpDxf.cpp index 13f364afb6..df71e35015 100644 --- a/src/Mod/Import/App/dxf/ImpExpDxf.cpp +++ b/src/Mod/Import/App/dxf/ImpExpDxf.cpp @@ -23,51 +23,47 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include +# if OCC_VERSION_HEX < 0x070600 +# 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 #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "ImpExpDxf.h" -#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 -#if OCC_VERSION_HEX < 0x070600 -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include using namespace Import; diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.h b/src/Mod/Import/App/dxf/ImpExpDxf.h index 3824b7ea30..2809bd7c82 100644 --- a/src/Mod/Import/App/dxf/ImpExpDxf.h +++ b/src/Mod/Import/App/dxf/ImpExpDxf.h @@ -23,11 +23,14 @@ #ifndef IMPEXPDXF_H #define IMPEXPDXF_H -#include "dxf.h" -#include -#include #include +#include +#include + +#include "dxf.h" + + class BRepAdaptor_Curve; namespace Import diff --git a/src/Mod/Import/App/dxf/dxf.cpp b/src/Mod/Import/App/dxf/dxf.cpp index 21fc50a1a5..080f77fcdc 100644 --- a/src/Mod/Import/App/dxf/dxf.cpp +++ b/src/Mod/Import/App/dxf/dxf.cpp @@ -8,20 +8,20 @@ //required by windows for M_PI definition #define _USE_MATH_DEFINES #include - -#include #include -#include +#include #include +#include #include #include #include -#include #include #include + #include "dxf.h" + using namespace std; Base::Vector3d toVector3d(const double* a) diff --git a/src/Mod/Import/App/dxf/dxf.h b/src/Mod/Import/App/dxf/dxf.h index fb7a853670..401ecb908b 100644 --- a/src/Mod/Import/App/dxf/dxf.h +++ b/src/Mod/Import/App/dxf/dxf.h @@ -7,19 +7,20 @@ #define _dxf_h_ #include +#include +#include +#include +#include #include -#include #include #include #include -#include -#include -#include -#include +#include #include #include + //Following is required to be defined on Ubuntu with OCC 6.3.1 #ifndef HAVE_IOSTREAM #define HAVE_IOSTREAM