From 2d50fd36dfbf241e086a286277d0ee31fb2d3c40 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 9 Oct 2022 20:31:31 +0200
Subject: [PATCH] [Spread] remove unused includes

- also sort includes
- also additions to precompiled header
---
 src/Mod/Spreadsheet/App/AppSpreadsheet.cpp    |  4 +--
 src/Mod/Spreadsheet/App/Cell.cpp              | 26 +++++++++---------
 src/Mod/Spreadsheet/App/Cell.h                |  6 +++--
 src/Mod/Spreadsheet/App/PreCompiled.h         | 27 ++++++++++++-------
 .../Spreadsheet/App/PropertyColumnWidths.cpp  | 11 ++++----
 .../App/PropertyColumnWidthsPyImp.cpp         |  3 +--
 .../Spreadsheet/App/PropertyRowHeights.cpp    | 11 ++++----
 .../App/PropertyRowHeightsPyImp.cpp           |  3 +--
 src/Mod/Spreadsheet/App/PropertySheet.cpp     | 22 +++++++--------
 src/Mod/Spreadsheet/App/PropertySheet.h       |  6 ++---
 .../Spreadsheet/App/PropertySheetPyImp.cpp    |  5 ++--
 src/Mod/Spreadsheet/App/Sheet.cpp             | 26 ++++++------------
 src/Mod/Spreadsheet/App/Sheet.h               | 26 ++++++++----------
 src/Mod/Spreadsheet/App/SheetObserver.cpp     |  2 ++
 src/Mod/Spreadsheet/App/SheetPyImp.cpp        | 10 +++----
 src/Mod/Spreadsheet/App/Utils.cpp             |  6 ++---
 src/Mod/Spreadsheet/App/Utils.h               |  7 ++---
 17 files changed, 95 insertions(+), 106 deletions(-)

diff --git a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
index cb25a3e4db..1e86e490f7 100644
--- a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
+++ b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
@@ -12,12 +12,10 @@
 
 #include "PreCompiled.h"
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
+
 #include "Sheet.h"
 
 
diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp
index cccb19b8ca..8b3db1e69e 100644
--- a/src/Mod/Spreadsheet/App/Cell.cpp
+++ b/src/Mod/Spreadsheet/App/Cell.cpp
@@ -23,27 +23,25 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <sstream>
+# include <QLocale>
+# include <boost/tokenizer.hpp>
+# include <boost/algorithm/string/predicate.hpp>
 #endif
 
-#include <QLocale>
-
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include "Cell.h"
-#include "Utils.h"
-#include <boost/tokenizer.hpp>
-#include <Base/Reader.h>
+#include <App/ExpressionParser.h>
+#include <Base/Console.h>
 #include <Base/Quantity.h>
+#include <Base/Reader.h>
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>
 #include <Base/Writer.h>
-#include <Base/Console.h>
-#include <App/ExpressionParser.h>
-#include "Sheet.h"
-#include <iomanip>
-#include <cctype>
 
-FC_LOG_LEVEL_INIT("Spreadsheet",true,true)
+#include "Cell.h"
+#include "Sheet.h"
+
+
+FC_LOG_LEVEL_INIT("Spreadsheet", true, true)
 
 #ifdef _MSC_VER
 #define __func__ __FUNCTION__
diff --git a/src/Mod/Spreadsheet/App/Cell.h b/src/Mod/Spreadsheet/App/Cell.h
index fb12306bfe..ce07716b49 100644
--- a/src/Mod/Spreadsheet/App/Cell.h
+++ b/src/Mod/Spreadsheet/App/Cell.h
@@ -25,12 +25,14 @@
 
 #include <string>
 #include <set>
-#include <App/Material.h>
-#include <App/Range.h>
+
 #include <App/Expression.h>
+#include <App/Material.h>
+
 #include "DisplayUnit.h"
 #include "Utils.h"
 
+
 namespace Base {
 class Unit;
 class XMLReader;
diff --git a/src/Mod/Spreadsheet/App/PreCompiled.h b/src/Mod/Spreadsheet/App/PreCompiled.h
index 08b361e4c1..fbd7bd1a95 100644
--- a/src/Mod/Spreadsheet/App/PreCompiled.h
+++ b/src/Mod/Spreadsheet/App/PreCompiled.h
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SPREADSHEET_PRECOMPILED_H
 #define SPREADSHEET_PRECOMPILED_H
 
@@ -39,20 +38,30 @@
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
 #include <cassert>
 #include <cmath>
+#include <iostream>
 
 // STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
 #include <algorithm>
-#include <stack>
-#include <queue>
 #include <bitset>
+#include <deque>
+#include <list>
+#include <map>
+#include <memory>
+#include <queue>
+#include <set>
+#include <sstream>
+#include <stack>
+#include <string>
+#include <vector>
+
+// boost
+#include <boost/regex.hpp>
+#include <boost/tokenizer.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/range/adaptor/map.hpp>
+#include <boost/range/algorithm/copy.hpp>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp
index e6cce19eca..0005a4503e 100644
--- a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp
+++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp
@@ -22,15 +22,14 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <App/Range.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
 
 #include "PropertyColumnWidths.h"
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <App/Range.h>
+#include "PropertyColumnWidthsPy.h"
 #include "Utils.h"
-#include <PropertyColumnWidthsPy.h>
+
 
 using namespace Spreadsheet;
 
diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp b/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp
index 57b9e5ebba..429dfca2e1 100644
--- a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp
+++ b/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include "PropertyColumnWidths.h"
-
 // inclusion of the generated files (generated out of PropertyColumnWidthsPy.xml)
 #include "PropertyColumnWidthsPy.h"
 #include "PropertyColumnWidthsPy.cpp"
 
+
 using namespace Spreadsheet;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp
index d2278ee5a8..21edc621fb 100644
--- a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp
+++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp
@@ -22,15 +22,14 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <App/Range.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
 
 #include "PropertyRowHeights.h"
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <App/Range.h>
+#include "PropertyRowHeightsPy.h"
 #include "Utils.h"
-#include <PropertyRowHeightsPy.h>
+
 
 using namespace Spreadsheet;
 
diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeightsPyImp.cpp b/src/Mod/Spreadsheet/App/PropertyRowHeightsPyImp.cpp
index 80e7c06b87..fede44acc5 100644
--- a/src/Mod/Spreadsheet/App/PropertyRowHeightsPyImp.cpp
+++ b/src/Mod/Spreadsheet/App/PropertyRowHeightsPyImp.cpp
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include "PropertyRowHeights.h"
-
 // inclusion of the generated files (generated out of PropertyRowHeightsPy.xml)
 #include "PropertyRowHeightsPy.h"
 #include "PropertyRowHeightsPy.cpp"
 
+
 using namespace Spreadsheet;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp
index 0604984bda..93a55c6734 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp
@@ -23,27 +23,27 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <boost/regex.hpp>
+# include <boost/range/adaptor/map.hpp>
+# include <boost/range/algorithm/copy.hpp>
 #endif
 
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/algorithm/copy.hpp>
-#include <boost/assign.hpp>
-#include <boost/regex.hpp>
-#include <Base/Console.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
+#include <App/Expression.h>
+#include <App/ExpressionParser.h>
+#include <App/ExpressionVisitors.h>
 #include <App/Property.h>
+#include <Base/Console.h>
 #include <Base/Interpreter.h>
-#include <Base/Writer.h>
 #include <Base/Reader.h>
 #include <Base/Tools.h>
-#include <Base/PyObjectBase.h>
+#include <Base/Writer.h>
+
 #include "PropertySheet.h"
+#include "PropertySheetPy.h"
 #include "Sheet.h"
-#include "Utils.h"
-#include <PropertySheetPy.h>
-#include <App/ExpressionVisitors.h>
-#include <App/ExpressionParser.h>
+
 
 FC_LOG_LEVEL_INIT("Spreadsheet", true, true)
 
diff --git a/src/Mod/Spreadsheet/App/PropertySheet.h b/src/Mod/Spreadsheet/App/PropertySheet.h
index 0ca0f362ae..2109b385fd 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.h
+++ b/src/Mod/Spreadsheet/App/PropertySheet.h
@@ -24,13 +24,13 @@
 #define PROPERTYSHEET_H
 
 #include <map>
-#include <App/DocumentObserver.h>
+
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
-#include <App/PropertyLinks.h>
-#include <Base/SmartPtrPy.h>
+
 #include "Cell.h"
 
+
 namespace Spreadsheet
 {
 
diff --git a/src/Mod/Spreadsheet/App/PropertySheetPyImp.cpp b/src/Mod/Spreadsheet/App/PropertySheetPyImp.cpp
index fff334e8b8..1107dbf201 100644
--- a/src/Mod/Spreadsheet/App/PropertySheetPyImp.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheetPyImp.cpp
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "Mod/Spreadsheet/App/PropertySheet.h"
-
+#include "PropertySheet.h"
 // inclusion of the generated files (generated out of PropertySheetPy.xml)
 #include "PropertySheetPy.h"
 #include "PropertySheetPy.cpp"
 
+
 using namespace Spreadsheet;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp
index 51e55c235e..93d3bd31c0 100644
--- a/src/Mod/Spreadsheet/App/Sheet.cpp
+++ b/src/Mod/Spreadsheet/App/Sheet.cpp
@@ -23,39 +23,29 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <deque>
+# include <memory>
+# include <sstream>
+# include <boost/tokenizer.hpp>
 #endif
 
-#include <boost/regex.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/algorithm/copy.hpp>
-#include <boost/assign.hpp>
-#include <boost/graph/topological_sort.hpp>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DynamicProperty.h>
-#include <App/FeaturePythonPyImp.h>
 #include <App/ExpressionParser.h>
+#include <App/FeaturePythonPyImp.h>
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
-#include <Base/Placement.h>
 #include <Base/Reader.h>
 #include <Base/Stream.h>
-#include <Base/Writer.h>
 #include <Base/Tools.h>
-#include <Base/Console.h>
+
 #include "Sheet.h"
 #include "SheetObserver.h"
-#include "Utils.h"
 #include "SheetPy.h"
-#include <ostream>
-#include <fstream>
-#include <string>
-#include <iomanip>
-#include <boost/regex.hpp>
-#include <deque>
 
-FC_LOG_LEVEL_INIT("Spreadsheet",true,true)
+
+FC_LOG_LEVEL_INIT("Spreadsheet", true, true)
 
 using namespace Base;
 using namespace App;
diff --git a/src/Mod/Spreadsheet/App/Sheet.h b/src/Mod/Spreadsheet/App/Sheet.h
index f758141a43..2c4e6469fe 100644
--- a/src/Mod/Spreadsheet/App/Sheet.h
+++ b/src/Mod/Spreadsheet/App/Sheet.h
@@ -24,26 +24,22 @@
 #define Spreadsheet_Spreadsheet_H
 
 #ifdef signals
-#undef signals
-#define signals signals
+# undef signals
+# define signals signals
 #endif
 
-#include <App/DocumentObject.h>
-#include <App/DocumentObserver.h>
-#include <App/PropertyFile.h>
-#include <App/PropertyUnits.h>
-#include <App/PropertyLinks.h>
-#include <App/PropertyStandard.h>
-#include <App/DynamicProperty.h>
-#include <App/Material.h>
-#include <App/Range.h>
-#include <App/FeaturePython.h>
-#include <Base/Unit.h>
 #include <map>
-#include "PropertySheet.h"
+
+#include <App/DocumentObject.h>
+#include <App/DynamicProperty.h>
+#include <App/FeaturePython.h>
+#include <App/PropertyUnits.h>
+#include <App/Range.h>
+#include <Base/Unit.h>
+
 #include "PropertyColumnWidths.h"
 #include "PropertyRowHeights.h"
-#include "Utils.h"
+#include "PropertySheet.h"
 
 
 namespace Spreadsheet
diff --git a/src/Mod/Spreadsheet/App/SheetObserver.cpp b/src/Mod/Spreadsheet/App/SheetObserver.cpp
index d540998edc..f5210dfd97 100644
--- a/src/Mod/Spreadsheet/App/SheetObserver.cpp
+++ b/src/Mod/Spreadsheet/App/SheetObserver.cpp
@@ -21,9 +21,11 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #include "SheetObserver.h"
 #include "PropertySheet.h"
 
+
 using namespace Spreadsheet;
 using namespace App;
 
diff --git a/src/Mod/Spreadsheet/App/SheetPyImp.cpp b/src/Mod/Spreadsheet/App/SheetPyImp.cpp
index b294663a65..c330453b01 100644
--- a/src/Mod/Spreadsheet/App/SheetPyImp.cpp
+++ b/src/Mod/Spreadsheet/App/SheetPyImp.cpp
@@ -24,16 +24,16 @@
 #include "PreCompiled.h"
 
 #include <boost/tokenizer.hpp>
-#include <Base/Exception.h>
-#include <Mod/Spreadsheet/App/Sheet.h>
-#include <App/PropertyStandard.h>
-#include "Utils.h"
-#include <App/Range.h>
 
+#include <App/Range.h>
+#include <Base/Exception.h>
+
+#include "Sheet.h"
 // inclusion of the generated files (generated out of SheetPy.xml)
 #include "SheetPy.h"
 #include "SheetPy.cpp"
 
+
 using namespace Spreadsheet;
 using namespace App;
 
diff --git a/src/Mod/Spreadsheet/App/Utils.cpp b/src/Mod/Spreadsheet/App/Utils.cpp
index f20ae7aced..8e2f6783c9 100644
--- a/src/Mod/Spreadsheet/App/Utils.cpp
+++ b/src/Mod/Spreadsheet/App/Utils.cpp
@@ -23,15 +23,13 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <sstream>
 #endif
 
 #include "Utils.h"
-#include <sstream>
-#include <cstdlib>
-#include <boost/regex.hpp>
-#include <Base/Exception.h>
 #include "Sheet.h"
 
+
 /**
   * Encode \a col as a string.
   *
diff --git a/src/Mod/Spreadsheet/App/Utils.h b/src/Mod/Spreadsheet/App/Utils.h
index 41c9ae5a51..c75830270b 100644
--- a/src/Mod/Spreadsheet/App/Utils.h
+++ b/src/Mod/Spreadsheet/App/Utils.h
@@ -23,13 +23,14 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include <string>
 #include <map>
-#include <set>
 #include <memory>
-#include <Base/BaseClass.h>
+#include <set>
+#include <string>
+
 #include <Mod/Spreadsheet/SpreadsheetGlobal.h>
 
+
 namespace Spreadsheet {
 
 SpreadsheetExport std::string columnName(int col);