reduced includes by means of static code analysis

2015-11-30 09:00:04 +01:00
parent b1bbd9975f
commit e6967dfe8b
23 changed files with 45 additions and 94 deletions
--- a/src/OpenMesh/Core/IO/BinaryHelper.cc
+++ b/src/OpenMesh/Core/IO/BinaryHelper.cc
@@ -57,7 +57,6 @@
 //== INCLUDES =================================================================


-#include <OpenMesh/Core/System/config.h>
 // -------------------- STL
 #include <algorithm>
 #include <iostream>
--- a/src/OpenMesh/Core/IO/IOManager.cc
+++ b/src/OpenMesh/Core/IO/IOManager.cc
@@ -57,7 +57,6 @@
 //== INCLUDES =================================================================


-#include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/IO/IOManager.hh>

 #include <iostream>
--- a/src/OpenMesh/Core/IO/OMFormat.cc
+++ b/src/OpenMesh/Core/IO/OMFormat.cc
@@ -56,8 +56,6 @@
 //== INCLUDES =================================================================

 #include <OpenMesh/Core/IO/OMFormat.hh>
-#include <algorithm>
-#include <iomanip>

 //== NAMESPACES ===============================================================

--- a/src/OpenMesh/Core/IO/reader/BaseReader.cc
+++ b/src/OpenMesh/Core/IO/reader/BaseReader.cc
@@ -49,14 +49,11 @@

 //=== INCLUDES ================================================================

-#include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/IO/reader/BaseReader.hh>
-#include <algorithm>
-#include <string>
+
 #if defined(OM_CC_MIPS)
 #  include <ctype.h>
 #else
-#  include <cctype>
 #endif


--- a/src/OpenMesh/Core/IO/reader/OBJReader.cc
+++ b/src/OpenMesh/Core/IO/reader/OBJReader.cc
@@ -53,7 +53,6 @@
 // OpenMesh
 #include <OpenMesh/Core/IO/reader/OBJReader.hh>
 #include <OpenMesh/Core/IO/IOManager.hh>
-#include <OpenMesh/Core/System/omstream.hh>
 #include <OpenMesh/Core/Utils/vector_cast.hh>
 #include <OpenMesh/Core/Utils/color_cast.hh>
 // STL
@@ -63,19 +62,13 @@
 #elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460)
 #  include <cctype>
 #else
-#  include <cctype>
 using std::isspace;
 #endif

 #ifndef WIN32
-#include <string.h>
 #endif

-#include <istream>
 #include <fstream>
-#include <vector>
-#include <algorithm>
-#include <functional>

 //=== NAMESPACES ==============================================================

--- a/src/OpenMesh/Core/IO/reader/OFFReader.cc
+++ b/src/OpenMesh/Core/IO/reader/OFFReader.cc
@@ -56,13 +56,10 @@
 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/System/omstream.hh>
 #include <OpenMesh/Core/IO/reader/OFFReader.hh>
-#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
 #include <OpenMesh/Core/IO/IOManager.hh>
 #include <OpenMesh/Core/Utils/color_cast.hh>
 // #include <OpenMesh/Core/IO/BinaryHelper.hh>

-#include <OpenMesh/Core/IO/SR_store.hh>
-
 //STL
 #include <iostream>
 #include <fstream>
@@ -74,12 +71,10 @@
 #elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460)
 #  include <cctype>
 #else
-#  include <cctype>
 using std::isspace;
 #endif

 #ifndef WIN32
-#include <string.h>
 #endif

 //=== NAMESPACES ==============================================================
--- a/src/OpenMesh/Core/IO/reader/PLYReader.cc
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc
@@ -54,10 +54,8 @@
 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/System/omstream.hh>
 #include <OpenMesh/Core/IO/reader/PLYReader.hh>
-#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
 #include <OpenMesh/Core/IO/IOManager.hh>
 #include <OpenMesh/Core/Utils/color_cast.hh>
-#include <OpenMesh/Core/IO/SR_store.hh>

 //STL
 #include <fstream>
@@ -65,7 +63,6 @@
 #include <memory>

 #ifndef WIN32
-#include <string.h>
 #endif

 //=== NAMESPACES ==============================================================
--- a/src/OpenMesh/Core/IO/reader/STLReader.cc
+++ b/src/OpenMesh/Core/IO/reader/STLReader.cc
@@ -57,12 +57,9 @@
 #include <fstream>

 // OpenMesh
-#include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/IO/BinaryHelper.hh>
 #include <OpenMesh/Core/IO/reader/STLReader.hh>
 #include <OpenMesh/Core/IO/IOManager.hh>
-#include <OpenMesh/Core/System/omstream.hh>
-#include <OpenMesh/Core/IO/importer/BaseImporter.hh>


 //=== NAMESPACES ==============================================================
--- a/src/OpenMesh/Core/IO/writer/BaseWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/BaseWriter.cc
@@ -50,14 +50,11 @@
 //=== INCLUDES ================================================================


-#include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/IO/writer/BaseWriter.hh>
-#include <algorithm>
-#include <string>
+
 #if defined(OM_CC_MIPS)
 #  include <ctype.h>
 #else
-#  include <cctype>
 #endif


--- a/src/OpenMesh/Core/IO/writer/OBJWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/OBJWriter.cc
@@ -55,11 +55,9 @@
 #include <limits>

 // OpenMesh
-#include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/IO/BinaryHelper.hh>
 #include <OpenMesh/Core/IO/writer/OBJWriter.hh>
 #include <OpenMesh/Core/IO/IOManager.hh>
-#include <OpenMesh/Core/System/omstream.hh>
 #include <OpenMesh/Core/Utils/color_cast.hh>

 //=== NAMESPACES ==============================================================
--- a/src/OpenMesh/Core/IO/writer/OFFWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/OFFWriter.cc
@@ -57,8 +57,6 @@
 #include <OpenMesh/Core/IO/BinaryHelper.hh>
 #include <OpenMesh/Core/IO/writer/OFFWriter.hh>

-#include <OpenMesh/Core/IO/SR_store.hh>
-
 //=== NAMESPACES ==============================================================


--- a/src/OpenMesh/Core/IO/writer/OMWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc
@@ -60,13 +60,10 @@
 #endif

 #include <fstream>
-#include <ostream>
 #include <vector>

 // -------------------- OpenMesh
 #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/writer/OMWriter.hh>

--- a/src/OpenMesh/Core/IO/writer/PLYWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/PLYWriter.cc
@@ -50,15 +50,11 @@
 //== INCLUDES =================================================================

 #include <fstream>
-#include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/System/omstream.hh>
 #include <OpenMesh/Core/Utils/Endian.hh>
 #include <OpenMesh/Core/IO/IOManager.hh>
 #include <OpenMesh/Core/IO/BinaryHelper.hh>
 #include <OpenMesh/Core/IO/writer/PLYWriter.hh>
-#include <OpenMesh/Core/Utils/GenProg.hh>
-
-#include <OpenMesh/Core/IO/SR_store.hh>

 #include <iostream>

--- a/src/OpenMesh/Core/IO/writer/STLWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/STLWriter.cc
@@ -54,7 +54,6 @@
 #include <fstream>

 // OpenMesh
-#include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/System/omstream.hh>
 #include <OpenMesh/Core/Geometry/VectorT.hh>
 #include <OpenMesh/Core/IO/BinaryHelper.hh>
--- a/src/OpenMesh/Core/IO/writer/VTKWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/VTKWriter.cc
@@ -3,11 +3,9 @@
 #include <fstream>
 #include <limits>

-#include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/IO/BinaryHelper.hh>
 #include <OpenMesh/Core/IO/writer/VTKWriter.hh>
 #include <OpenMesh/Core/IO/IOManager.hh>
-#include <OpenMesh/Core/System/omstream.hh>
 #include <OpenMesh/Core/Utils/color_cast.hh>

 //=== NAMESPACES ==============================================================
--- a/src/OpenMesh/Core/Mesh/TriConnectivity.cc
+++ b/src/OpenMesh/Core/Mesh/TriConnectivity.cc
@@ -50,7 +50,6 @@
 //  CLASS TriMeshT - IMPLEMENTATION

 #include <OpenMesh/Core/Mesh/TriConnectivity.hh>
-#include <OpenMesh/Core/System/omstream.hh>

 namespace OpenMesh
 {
--- a/src/OpenMesh/Core/Utils/BaseProperty.cc
+++ b/src/OpenMesh/Core/Utils/BaseProperty.cc
@@ -47,7 +47,6 @@
 \*===========================================================================*/

 #include <OpenMesh/Core/Utils/BaseProperty.hh>
-#include <ostream>

 namespace OpenMesh
 {
--- a/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
+++ b/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
@@ -59,7 +59,6 @@


 #include <OpenMesh/Core/Utils/RandomNumberGenerator.hh>
-#include <cstdlib>


 //== NAMESPACES ===============================================================
--- a/src/OpenMesh/Tools/Utils/Gnuplot.cc
+++ b/src/OpenMesh/Tools/Utils/Gnuplot.cc
@@ -46,8 +46,8 @@
 #endif

 #ifndef WIN32
-  #include <stdlib.h>
-  #include <string.h>
+
+#include <string.h>
 #else
  #ifdef __MINGW32__
    #include <stdlib.h>
--- a/src/OpenMesh/Tools/Utils/conio.cc
+++ b/src/OpenMesh/Tools/Utils/conio.cc
@@ -46,7 +46,6 @@
 *                                                                           *
 \*===========================================================================*/

-#include <OpenMesh/Core/System/config.hh>
 #include <OpenMesh/Tools/Utils/conio.hh>

 // ----------------------------------------------------------------- MSVC Compiler ----
@@ -92,7 +91,6 @@ int getche() { return ::getche(); }
 #endif
 #include <termios.h>   /* tcsetattr()    */
 #include <sys/ioctl.h> /* ioctl()        */
-#include <sys/time.h>  /* struct timeval */

 namespace OpenMesh {
 namespace Utils {
--- a/src/OpenMesh/Tools/Utils/conio.hh
+++ b/src/OpenMesh/Tools/Utils/conio.hh
@@ -49,6 +49,8 @@
 #ifndef OPENMESH_UTILS_CONIO_HH
 #define OPENMESH_UTILS_CONIO_HH
 // ----------------------------------------------------------------------------
+#include <OpenMesh/Core/System/OpenMeshDLLMacros.hh>
+
 namespace OpenMesh {
 namespace Utils {
 // ----------------------------------------------------------------------------
--- a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc
+++ b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc
@@ -58,8 +58,6 @@
 #include <OpenMesh/Tools/VDPM/VHierarchyWindow.hh>

 #ifndef WIN32
-#include <string.h>
-#include <cstdlib>
 #else
  #if defined(__MINGW32__)
    #include <stdlib.h>
--- a/src/Python/Bindings.cc
+++ b/src/Python/Bindings.cc
@@ -1,8 +1,6 @@
 #include "Python/Bindings.hh"
 #include "Python/Vector.hh"
 #include "Python/Mesh.hh"
-#include "Python/Iterator.hh"
-#include "Python/Circulator.hh"
 #include "Python/PropertyManager.hh"
 #include "Python/InputOutput.hh"