reduced includes by means of static code analysis

src/OpenMesh/Core/IO/BinaryHelper.cc

@@ -57,7 +57,6 @@
 //== INCLUDES =================================================================
 
 
-#include <OpenMesh/Core/System/config.h>
 // -------------------- STL
 #include <algorithm>
 #include <iostream>

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>

src/OpenMesh/Core/IO/OMFormat.cc

@@ -56,8 +56,6 @@
 //== INCLUDES =================================================================
 
 #include <OpenMesh/Core/IO/OMFormat.hh>
-#include <algorithm>
-#include <iomanip>
 
 //== NAMESPACES ===============================================================
 

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
 
 

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 ==============================================================
 

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 ==============================================================

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 ==============================================================

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 ==============================================================

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
 
 

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 ==============================================================

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 ==============================================================
 
 

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>
 

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>
 

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>

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 ==============================================================

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
 {

src/OpenMesh/Core/Utils/BaseProperty.cc

@@ -47,7 +47,6 @@
 \*===========================================================================*/
 
 #include <OpenMesh/Core/Utils/BaseProperty.hh>
-#include <ostream>
 
 namespace OpenMesh
 {

src/OpenMesh/Core/Utils/RandomNumberGenerator.cc

@@ -59,7 +59,6 @@
 
 
 #include <OpenMesh/Core/Utils/RandomNumberGenerator.hh>
-#include <cstdlib>
 
 
 //== NAMESPACES ===============================================================

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>

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 {

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 {
 // ----------------------------------------------------------------------------

src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc

-/* ========================================================================= *
- *                                                                           *
- *                               OpenMesh                                    *
- *           Copyright (c) 2001-2015, RWTH-Aachen University                 *
- *           Department of Computer Graphics and Multimedia                  *
- *                          All rights reserved.                             *
- *                            www.openmesh.org                               *
- *                                                                           *
- *---------------------------------------------------------------------------*
- * This file is part of OpenMesh.                                            *
- *---------------------------------------------------------------------------*
- *                                                                           *
- * Redistribution and use in source and binary forms, with or without        *
- * modification, are permitted provided that the following conditions        *
- * are met:                                                                  *
- *                                                                           *
- * 1. Redistributions of source code must retain the above copyright notice, *
- *    this list of conditions and the following disclaimer.                  *
- *                                                                           *
- * 2. Redistributions in binary form must reproduce the above copyright      *
- *    notice, this list of conditions and the following disclaimer in the    *
- *    documentation and/or other materials provided with the distribution.   *
- *                                                                           *
- * 3. Neither the name of the copyright holder nor the names of its          *
- *    contributors may be used to endorse or promote products derived from   *
- *    this software without specific prior written permission.               *
- *                                                                           *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS       *
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A           *
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  *
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,       *
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR        *
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF    *
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING      *
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS        *
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              *
- *                                                                           *
+/* ========================================================================= *
+ *                                                                           *
+ *                               OpenMesh                                    *
+ *           Copyright (c) 2001-2015, RWTH-Aachen University                 *
+ *           Department of Computer Graphics and Multimedia                  *
+ *                          All rights reserved.                             *
+ *                            www.openmesh.org                               *
+ *                                                                           *
+ *---------------------------------------------------------------------------*
+ * This file is part of OpenMesh.                                            *
+ *---------------------------------------------------------------------------*
+ *                                                                           *
+ * Redistribution and use in source and binary forms, with or without        *
+ * modification, are permitted provided that the following conditions        *
+ * are met:                                                                  *
+ *                                                                           *
+ * 1. Redistributions of source code must retain the above copyright notice, *
+ *    this list of conditions and the following disclaimer.                  *
+ *                                                                           *
+ * 2. Redistributions in binary form must reproduce the above copyright      *
+ *    notice, this list of conditions and the following disclaimer in the    *
+ *    documentation and/or other materials provided with the distribution.   *
+ *                                                                           *
+ * 3. Neither the name of the copyright holder nor the names of its          *
+ *    contributors may be used to endorse or promote products derived from   *
+ *    this software without specific prior written permission.               *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS       *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A           *
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  *
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,       *
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR        *
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF    *
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING      *
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS        *
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              *
+ *                                                                           *
  * ========================================================================= */
 
 /*===========================================================================*\
@@ -58,8 +58,6 @@
 #include <OpenMesh/Tools/VDPM/VHierarchyWindow.hh>
 
 #ifndef WIN32
-#include <string.h>
-#include <cstdlib>
 #else
   #if defined(__MINGW32__)
     #include <stdlib.h>

src/Python/Bindings.cc

 #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"