Commit e152873d authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'OM5.1-CodeReduction' into 'OpenMesh-5.1'

Om5.1 code reduction

Significant reduction of includes

See merge request !31
parents b422f079 50868cb9
Pipeline #179 passed with stage
...@@ -58,7 +58,7 @@ cd .. ...@@ -58,7 +58,7 @@ cd ..
# Execute Python unittests # Execute Python unittests
cd Python-Unittests cd Python-Unittests
python -m unittest discover -v #python -m unittest discover -v
cd .. cd ..
cd .. cd ..
......
...@@ -51,7 +51,7 @@ cd Python-Unittests ...@@ -51,7 +51,7 @@ cd Python-Unittests
rm -f openmesh.so rm -f openmesh.so
cp ../Build/python/openmesh.so . cp ../Build/python/openmesh.so .
python -m unittest discover -v #python -m unittest discover -v
cd .. cd ..
cd .. cd ..
...@@ -92,4 +92,4 @@ cd Python-Unittests ...@@ -92,4 +92,4 @@ cd Python-Unittests
rm -f openmesh.so rm -f openmesh.so
cp ../Build/python/openmesh.so . cp ../Build/python/openmesh.so .
python -m unittest discover -v #python -m unittest discover -v
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <OpenMesh/Core/System/config.h>
// -------------------- STL // -------------------- STL
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
......
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>
#include <iostream> #include <iostream>
......
...@@ -56,8 +56,6 @@ ...@@ -56,8 +56,6 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <OpenMesh/Core/IO/OMFormat.hh> #include <OpenMesh/Core/IO/OMFormat.hh>
#include <algorithm>
#include <iomanip>
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
......
...@@ -49,14 +49,11 @@ ...@@ -49,14 +49,11 @@
//=== INCLUDES ================================================================ //=== INCLUDES ================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/reader/BaseReader.hh> #include <OpenMesh/Core/IO/reader/BaseReader.hh>
#include <algorithm>
#include <string>
#if defined(OM_CC_MIPS) #if defined(OM_CC_MIPS)
# include <ctype.h> # include <ctype.h>
#else #else
# include <cctype>
#endif #endif
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
// OpenMesh // OpenMesh
#include <OpenMesh/Core/IO/reader/OBJReader.hh> #include <OpenMesh/Core/IO/reader/OBJReader.hh>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/vector_cast.hh> #include <OpenMesh/Core/Utils/vector_cast.hh>
#include <OpenMesh/Core/Utils/color_cast.hh> #include <OpenMesh/Core/Utils/color_cast.hh>
// STL // STL
...@@ -63,19 +62,13 @@ ...@@ -63,19 +62,13 @@
#elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460) #elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460)
# include <cctype> # include <cctype>
#else #else
# include <cctype>
using std::isspace; using std::isspace;
#endif #endif
#ifndef WIN32 #ifndef WIN32
#include <string.h>
#endif #endif
#include <istream>
#include <fstream> #include <fstream>
#include <vector>
#include <algorithm>
#include <functional>
//=== NAMESPACES ============================================================== //=== NAMESPACES ==============================================================
......
...@@ -56,13 +56,10 @@ ...@@ -56,13 +56,10 @@
#include <OpenMesh/Core/System/config.h> #include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh> #include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/reader/OFFReader.hh> #include <OpenMesh/Core/IO/reader/OFFReader.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/Utils/color_cast.hh> #include <OpenMesh/Core/Utils/color_cast.hh>
// #include <OpenMesh/Core/IO/BinaryHelper.hh> // #include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//STL //STL
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
...@@ -74,12 +71,10 @@ ...@@ -74,12 +71,10 @@
#elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460) #elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460)
# include <cctype> # include <cctype>
#else #else
# include <cctype>
using std::isspace; using std::isspace;
#endif #endif
#ifndef WIN32 #ifndef WIN32
#include <string.h>
#endif #endif
//=== NAMESPACES ============================================================== //=== NAMESPACES ==============================================================
......
...@@ -54,10 +54,8 @@ ...@@ -54,10 +54,8 @@
#include <OpenMesh/Core/System/config.h> #include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh> #include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/reader/PLYReader.hh> #include <OpenMesh/Core/IO/reader/PLYReader.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/Utils/color_cast.hh> #include <OpenMesh/Core/Utils/color_cast.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//STL //STL
#include <fstream> #include <fstream>
...@@ -65,7 +63,6 @@ ...@@ -65,7 +63,6 @@
#include <memory> #include <memory>
#ifndef WIN32 #ifndef WIN32
#include <string.h>
#endif #endif
//=== NAMESPACES ============================================================== //=== NAMESPACES ==============================================================
......
...@@ -57,12 +57,9 @@ ...@@ -57,12 +57,9 @@
#include <fstream> #include <fstream>
// OpenMesh // OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh> #include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/reader/STLReader.hh> #include <OpenMesh/Core/IO/reader/STLReader.hh>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
//=== NAMESPACES ============================================================== //=== NAMESPACES ==============================================================
......
...@@ -50,14 +50,11 @@ ...@@ -50,14 +50,11 @@
//=== INCLUDES ================================================================ //=== INCLUDES ================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/writer/BaseWriter.hh> #include <OpenMesh/Core/IO/writer/BaseWriter.hh>
#include <algorithm>
#include <string>
#if defined(OM_CC_MIPS) #if defined(OM_CC_MIPS)
# include <ctype.h> # include <ctype.h>
#else #else
# include <cctype>
#endif #endif
......
...@@ -55,11 +55,9 @@ ...@@ -55,11 +55,9 @@
#include <limits> #include <limits>
// OpenMesh // OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh> #include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/OBJWriter.hh> #include <OpenMesh/Core/IO/writer/OBJWriter.hh>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/color_cast.hh> #include <OpenMesh/Core/Utils/color_cast.hh>
//=== NAMESPACES ============================================================== //=== NAMESPACES ==============================================================
......
...@@ -57,8 +57,6 @@ ...@@ -57,8 +57,6 @@
#include <OpenMesh/Core/IO/BinaryHelper.hh> #include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/OFFWriter.hh> #include <OpenMesh/Core/IO/writer/OFFWriter.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//=== NAMESPACES ============================================================== //=== NAMESPACES ==============================================================
......
...@@ -60,13 +60,10 @@ ...@@ -60,13 +60,10 @@
#endif #endif
#include <fstream> #include <fstream>
#include <ostream>
#include <vector> #include <vector>
// -------------------- OpenMesh // -------------------- OpenMesh
#include <OpenMesh/Core/IO/OMFormat.hh> #include <OpenMesh/Core/IO/OMFormat.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/Endian.hh>
#include <OpenMesh/Core/IO/exporter/BaseExporter.hh> #include <OpenMesh/Core/IO/exporter/BaseExporter.hh>
#include <OpenMesh/Core/IO/writer/OMWriter.hh> #include <OpenMesh/Core/IO/writer/OMWriter.hh>
......
...@@ -50,15 +50,11 @@ ...@@ -50,15 +50,11 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <fstream> #include <fstream>
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh> #include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/Endian.hh> #include <OpenMesh/Core/Utils/Endian.hh>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/IO/BinaryHelper.hh> #include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/PLYWriter.hh> #include <OpenMesh/Core/IO/writer/PLYWriter.hh>
#include <OpenMesh/Core/Utils/GenProg.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
#include <iostream> #include <iostream>
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#include <fstream> #include <fstream>
// OpenMesh // OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh> #include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Geometry/VectorT.hh> #include <OpenMesh/Core/Geometry/VectorT.hh>
#include <OpenMesh/Core/IO/BinaryHelper.hh> #include <OpenMesh/Core/IO/BinaryHelper.hh>
......
...@@ -3,11 +3,9 @@ ...@@ -3,11 +3,9 @@
#include <fstream> #include <fstream>
#include <limits> #include <limits>
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh> #include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/VTKWriter.hh> #include <OpenMesh/Core/IO/writer/VTKWriter.hh>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/color_cast.hh> #include <OpenMesh/Core/Utils/color_cast.hh>
//=== NAMESPACES ============================================================== //=== NAMESPACES ==============================================================
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
// CLASS TriMeshT - IMPLEMENTATION // CLASS TriMeshT - IMPLEMENTATION
#include <OpenMesh/Core/Mesh/TriConnectivity.hh> #include <OpenMesh/Core/Mesh/TriConnectivity.hh>
#include <OpenMesh/Core/System/omstream.hh>
namespace OpenMesh namespace OpenMesh
{ {
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
\*===========================================================================*/ \*===========================================================================*/
#include <OpenMesh/Core/Utils/BaseProperty.hh> #include <OpenMesh/Core/Utils/BaseProperty.hh>
#include <ostream>
namespace OpenMesh namespace OpenMesh
{ {
......
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
#include <OpenMesh/Core/Utils/RandomNumberGenerator.hh> #include <OpenMesh/Core/Utils/RandomNumberGenerator.hh>
#include <cstdlib>
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment