From 909e4f2dd33c1f03fa8a496b5b4d6b23b7b2db24 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 8 Oct 2022 02:10:26 +0200 Subject: [PATCH] [TD] DrawView*: remove unused includes - part 2 - also sort includes - also additions to precompiled header --- src/Mod/TechDraw/App/DrawViewImage.cpp | 16 ++--- src/Mod/TechDraw/App/DrawViewImage.h | 3 +- src/Mod/TechDraw/App/DrawViewMulti.cpp | 40 ++--------- src/Mod/TechDraw/App/DrawViewMulti.h | 5 +- src/Mod/TechDraw/App/DrawViewPart.cpp | 67 +++++++---------- src/Mod/TechDraw/App/DrawViewPart.h | 7 +- src/Mod/TechDraw/App/DrawViewPartPyImp.cpp | 28 +++----- src/Mod/TechDraw/App/DrawViewPyImp.cpp | 4 +- src/Mod/TechDraw/App/DrawViewSection.cpp | 75 ++++++++------------ src/Mod/TechDraw/App/DrawViewSection.h | 9 +-- src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp | 75 ++++++++++---------- src/Mod/TechDraw/App/DrawViewSpreadsheet.h | 3 +- src/Mod/TechDraw/App/DrawViewSymbol.cpp | 19 ++--- src/Mod/TechDraw/App/DrawViewSymbol.h | 7 +- src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp | 3 +- src/Mod/TechDraw/App/DrawWeldSymbol.cpp | 17 ++--- src/Mod/TechDraw/App/DrawWeldSymbol.h | 5 +- src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp | 9 +-- src/Mod/TechDraw/App/PreCompiled.h | 7 +- 19 files changed, 144 insertions(+), 255 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewImage.cpp b/src/Mod/TechDraw/App/DrawViewImage.cpp index c1babd3647..3e83750121 100644 --- a/src/Mod/TechDraw/App/DrawViewImage.cpp +++ b/src/Mod/TechDraw/App/DrawViewImage.cpp @@ -20,28 +20,22 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include # include #endif -#include -#include -#include - -#include -#include -#include #include +#include +#include -#include "DrawUtil.h" #include "DrawViewImage.h" +#include "DrawUtil.h" + using namespace TechDraw; -using namespace std; - //=========================================================================== // DrawViewImage diff --git a/src/Mod/TechDraw/App/DrawViewImage.h b/src/Mod/TechDraw/App/DrawViewImage.h index ec1af6bd87..e01b488190 100644 --- a/src/Mod/TechDraw/App/DrawViewImage.h +++ b/src/Mod/TechDraw/App/DrawViewImage.h @@ -23,12 +23,11 @@ #ifndef DrawViewImage_h_ #define DrawViewImage_h_ -#include - #include #include #include #include +#include #include "DrawView.h" diff --git a/src/Mod/TechDraw/App/DrawViewMulti.cpp b/src/Mod/TechDraw/App/DrawViewMulti.cpp index e567eb3c21..cdf809b9da 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.cpp +++ b/src/Mod/TechDraw/App/DrawViewMulti.cpp @@ -20,53 +20,25 @@ * * ***************************************************************************/ - #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 #endif -#include - -# include -# include - -#include -#include -#include -#include -#include #include -#include -#include - -#include "Geometry.h" #include "GeometryObject.h" #include "DrawUtil.h" #include "DrawViewMulti.h" -using namespace TechDraw; -using namespace std; +using namespace TechDraw; //=========================================================================== // DrawViewMulti diff --git a/src/Mod/TechDraw/App/DrawViewMulti.h b/src/Mod/TechDraw/App/DrawViewMulti.h index c8f959f7f7..739df4092c 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.h +++ b/src/Mod/TechDraw/App/DrawViewMulti.h @@ -25,13 +25,12 @@ #ifndef DrawViewMulti_h_ #define DrawViewMulti_h_ -#include +#include #include #include #include - -#include +#include #include "DrawViewPart.h" diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index 2bbbb9124a..d3fda223ec 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -22,56 +22,43 @@ * * ***************************************************************************/ - #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 #endif -#include -#include -#include -#include - -#include - #include #include -#include -#include #include #include #include -#include #include -#include -#include -#include - +#include "DrawViewPart.h" +#include "DrawViewPartPy.h" // generated from DrawViewPartPy.xml #include "Cosmetic.h" #include "DrawGeomHatch.h" #include "DrawHatch.h" @@ -87,12 +74,8 @@ #include "GeometryObject.h" #include "ShapeExtractor.h" -#include "DrawViewPart.h" -#include // generated from DrawViewPartPy.xml using namespace TechDraw; -using namespace std; - //=========================================================================== // DrawViewPart diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h index 70e2db9865..f75d9eef91 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.h +++ b/src/Mod/TechDraw/App/DrawViewPart.h @@ -25,11 +25,8 @@ #ifndef DrawViewPart_h_ #define DrawViewPart_h_ -#include - #include #include -#include #include #include @@ -37,11 +34,11 @@ #include #include #include -#include #include +#include -#include "CosmeticExtension.h" #include "DrawView.h" +#include "CosmeticExtension.h" class gp_Pnt; diff --git a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp index 17ffc5f652..cb9c9977fd 100644 --- a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp @@ -22,24 +22,15 @@ #include "PreCompiled.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#ifndef _PreComp_ +# include +# include +# include +# include +# include +#endif #include -#include -#include -#include #include #include @@ -48,16 +39,13 @@ #include #include "DrawViewPart.h" -#include "GeometryObject.h" #include "Geometry.h" +#include "GeometryObject.h" #include "Cosmetic.h" -#include "CosmeticExtension.h" #include "DrawUtil.h" // inclusion of the generated files (generated out of DrawViewPartPy.xml) #include -#include -#include #include #include diff --git a/src/Mod/TechDraw/App/DrawViewPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPyImp.cpp index 74578f3845..1d2025f532 100644 --- a/src/Mod/TechDraw/App/DrawViewPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewPyImp.cpp @@ -22,12 +22,12 @@ #include "PreCompiled.h" -#include - +#include "DrawView.h" // inclusion of the generated files (generated out of DrawViewPy.xml) #include #include + using namespace TechDraw; // returns a string which represents the object e.g. when printed in python diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index 690ed1678c..fe9b9e2daf 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -22,66 +22,52 @@ * * ***************************************************************************/ - #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 #endif -#include -#include - -#include -#include -#include - #include #include -#include #include -#include #include #include -#include #include -#include - -#include "Geometry.h" -#include "GeometryObject.h" -#include "HatchLine.h" -#include "DrawUtil.h" -#include "DrawProjGroupItem.h" +#include "DrawViewSection.h" #include "DrawGeomHatch.h" #include "DrawHatch.h" -#include "DrawViewSection.h" +#include "DrawProjGroupItem.h" +#include "DrawUtil.h" +#include "Geometry.h" +#include "GeometryObject.h" + using namespace TechDraw; -using namespace std; const char* DrawViewSection::SectionDirEnums[]= {"Right", "Left", @@ -95,7 +81,6 @@ const char* DrawViewSection::CutSurfaceEnums[]= {"Hide", "PatHatch", nullptr}; - //=========================================================================== // DrawViewSection //=========================================================================== diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h index 82eaf2d4d0..b7092a3616 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.h +++ b/src/Mod/TechDraw/App/DrawViewSection.h @@ -25,22 +25,17 @@ #ifndef DrawViewSection_h_ #define DrawViewSection_h_ -#include - #include +#include #include #include #include #include #include - -#include -#include -#include +#include #include "DrawViewPart.h" -#include "HatchLine.h" class Bnd_Box; diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp index 0dd2052448..3113cc3219 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp @@ -21,37 +21,26 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include # include +# include #endif -#include - -#include - -#include #include -#include -#include #include -#include -#include -#include - -#include "Preferences.h" -#include "DrawUtil.h" -#include "DrawViewSpreadsheet.h" - #include #include -using namespace TechDraw; -using namespace std; +#include "DrawViewSpreadsheet.h" +#include "DrawUtil.h" +#include "Preferences.h" +using namespace TechDraw; + //=========================================================================== // DrawViewSpreadsheet //=========================================================================== @@ -175,7 +164,8 @@ std::string DrawViewSpreadsheet::getSheetImage() std::string sColStart, sColEnd; if (boost::regex_search(scellstart, what, re)) { if (what.size() < 3) { - Base::Console().Error("%s - start cell (%s) is invalid\n", getNameInDocument(), CellStart.getValue()); + Base::Console().Error("%s - start cell (%s) is invalid\n", getNameInDocument(), + CellStart.getValue()); return std::string(); } @@ -249,14 +239,13 @@ std::string DrawViewSpreadsheet::getSheetImage() validRowNumbers.push_back(iRow); } - // create the Svg code - + // create the SVG code std::stringstream result; result << getSVGHead(); std::string ViewName = Label.getValue(); App::Color c = TextColor.getValue(); - result << "" << endl; + result << "" << std::endl; // fill the cells float rowoffset = 0.0; @@ -267,10 +256,12 @@ std::string DrawViewSpreadsheet::getSheetImage() Spreadsheet::Sheet* sheet = static_cast(link); std::vector skiplist; - for (std::vector::const_iterator col = validColNames.begin(); col != validColNames.end(); ++col) { + for (std::vector::const_iterator col = validColNames.begin(); + col != validColNames.end(); ++col) { // create a group for each column - result << " " << endl; - for (std::vector::const_iterator row = validRowNumbers.begin(); row != validRowNumbers.end(); ++row) { + result << " " << std::endl; + for (std::vector::const_iterator row = validRowNumbers.begin(); + row != validRowNumbers.end(); ++row) { // get cell size std::stringstream srow; srow << (*row); @@ -342,31 +333,39 @@ std::string DrawViewSpreadsheet::getSheetImage() } // skip cell if found in skiplist if (std::find(skiplist.begin(), skiplist.end(), address.toString()) == skiplist.end()) { - result << " " << endl; + result << " " << std::endl; if (alignment & Spreadsheet::Cell::ALIGNMENT_LEFT) - result << " " << celltext << "" << endl; + result << " " << celltext << "" << std::endl; } } rowoffset = rowoffset + sheet->getRowHeight(address.row()); } - result << " " << endl; + result << " " << std::endl; rowoffset = 0.0; coloffset = coloffset + cellwidth; } // close the containing group - result << "" << endl; + result << "" << std::endl; result << getSVGTail(); diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h index cb4cb55872..4f1f6f0c94 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h @@ -23,11 +23,10 @@ #ifndef DrawViewSpreadsheet_h_ #define DrawViewSpreadsheet_h_ -#include - #include #include #include +#include #include "DrawViewSymbol.h" diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.cpp b/src/Mod/TechDraw/App/DrawViewSymbol.cpp index 4b20d90698..abba61fc72 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbol.cpp @@ -20,30 +20,25 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include +# include +# include "QDomNodeModel.h" +# include +# include #endif -#include -#include -#include "QDomNodeModel.h" - -#include -#include #include -#include -#include "DrawUtil.h" -#include "DrawPage.h" #include "DrawViewSymbol.h" +#include "DrawViewSymbolPy.h" // generated from DrawViewSymbolPy.xml +#include "DrawPage.h" +#include "DrawUtil.h" -#include // generated from DrawViewSymbolPy.xml using namespace TechDraw; -using namespace std; //=========================================================================== // DrawViewSymbol diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.h b/src/Mod/TechDraw/App/DrawViewSymbol.h index 873358ae99..3780e2ea76 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.h +++ b/src/Mod/TechDraw/App/DrawViewSymbol.h @@ -23,19 +23,16 @@ #ifndef DrawViewSymbol_h_ #define DrawViewSymbol_h_ -#include - -#include - #include -#include #include #include #include +#include #include "DrawView.h" + namespace TechDraw { class DrawPage; diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp index c891c153f8..110e896e2b 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp @@ -22,18 +22,17 @@ #include "PreCompiled.h" -#include #include #include #include "DrawViewSymbol.h" #include "DrawView.h" - // inclusion of the generated files #include #include #include + using namespace TechDraw; // returns a string which represents the object e.g. when printed in python diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp index bb7ed9644d..a6b90f31b3 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp @@ -22,24 +22,15 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include #include #include #include -#include -#include -#include "DrawUtil.h" - -#include // generated from DrawWeldSymbolPy.xml - -#include "DrawLeaderLine.h" -#include "DrawTile.h" -#include "DrawTileWeld.h" #include "DrawWeldSymbol.h" +#include "DrawWeldSymbolPy.h" // generated from DrawWeldSymbolPy.xml +#include "DrawLeaderLine.h" +#include "DrawTileWeld.h" + using namespace TechDraw; diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.h b/src/Mod/TechDraw/App/DrawWeldSymbol.h index b46567d635..c25c1f3980 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.h +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.h @@ -23,11 +23,10 @@ #ifndef TechDraw_DrawWeldSymbol_h_ #define TechDraw_DrawWeldSymbol_h_ +#include +#include #include -# include -# include - #include "DrawView.h" diff --git a/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp index f5973f876c..c9d1d4eb44 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp @@ -21,20 +21,13 @@ ***************************************************************************/ #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include -#include -#include #include "DrawWeldSymbol.h" - // inclusion of the generated files (generated out of DrawWeldSymbolPy.xml) -#include #include #include + using namespace TechDraw; // returns a string which represents the object e.g. when printed in python diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h index 698a96fdf9..7585654cba 100644 --- a/src/Mod/TechDraw/App/PreCompiled.h +++ b/src/Mod/TechDraw/App/PreCompiled.h @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -70,9 +71,13 @@ #include #include -#include +#include +#include "QDomNodeModel.h" #include #include +#include +#include +#include // OpenCasCade ===================================================================================== #include