[Spread] remove unused includes

- also sort includes
- also additions to precompiled header

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"
 
 

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__

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;

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>

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;
 

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

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;
 

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

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)
 

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
 {
 

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

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;

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

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;
 

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;
 

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.
   *

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);