From e6967dfe8b9fe8d126be1373af36a98af41d4b4f Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 30 Nov 2015 09:00:04 +0100 Subject: [PATCH] reduced includes by means of static code analysis --- src/OpenMesh/Core/IO/BinaryHelper.cc | 1 - src/OpenMesh/Core/IO/IOManager.cc | 1 - src/OpenMesh/Core/IO/OMFormat.cc | 2 - src/OpenMesh/Core/IO/reader/BaseReader.cc | 5 +- src/OpenMesh/Core/IO/reader/OBJReader.cc | 7 -- src/OpenMesh/Core/IO/reader/OFFReader.cc | 5 -- src/OpenMesh/Core/IO/reader/PLYReader.cc | 3 - src/OpenMesh/Core/IO/reader/STLReader.cc | 3 - src/OpenMesh/Core/IO/writer/BaseWriter.cc | 5 +- src/OpenMesh/Core/IO/writer/OBJWriter.cc | 2 - src/OpenMesh/Core/IO/writer/OFFWriter.cc | 2 - src/OpenMesh/Core/IO/writer/OMWriter.cc | 3 - src/OpenMesh/Core/IO/writer/PLYWriter.cc | 4 - src/OpenMesh/Core/IO/writer/STLWriter.cc | 1 - src/OpenMesh/Core/IO/writer/VTKWriter.cc | 2 - src/OpenMesh/Core/Mesh/TriConnectivity.cc | 1 - src/OpenMesh/Core/Utils/BaseProperty.cc | 1 - .../Core/Utils/RandomNumberGenerator.cc | 1 - src/OpenMesh/Tools/Utils/Gnuplot.cc | 4 +- src/OpenMesh/Tools/Utils/conio.cc | 2 - src/OpenMesh/Tools/Utils/conio.hh | 2 + src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc | 80 +++++++++---------- src/Python/Bindings.cc | 2 - 23 files changed, 45 insertions(+), 94 deletions(-) diff --git a/src/OpenMesh/Core/IO/BinaryHelper.cc b/src/OpenMesh/Core/IO/BinaryHelper.cc index 505c9234..d349e7f5 100644 --- a/src/OpenMesh/Core/IO/BinaryHelper.cc +++ b/src/OpenMesh/Core/IO/BinaryHelper.cc @@ -57,7 +57,6 @@ //== INCLUDES ================================================================= -#include // -------------------- STL #include #include diff --git a/src/OpenMesh/Core/IO/IOManager.cc b/src/OpenMesh/Core/IO/IOManager.cc index bc7b01b2..b531c142 100644 --- a/src/OpenMesh/Core/IO/IOManager.cc +++ b/src/OpenMesh/Core/IO/IOManager.cc @@ -57,7 +57,6 @@ //== INCLUDES ================================================================= -#include #include #include diff --git a/src/OpenMesh/Core/IO/OMFormat.cc b/src/OpenMesh/Core/IO/OMFormat.cc index f93c8424..231dfacd 100644 --- a/src/OpenMesh/Core/IO/OMFormat.cc +++ b/src/OpenMesh/Core/IO/OMFormat.cc @@ -56,8 +56,6 @@ //== INCLUDES ================================================================= #include -#include -#include //== NAMESPACES =============================================================== diff --git a/src/OpenMesh/Core/IO/reader/BaseReader.cc b/src/OpenMesh/Core/IO/reader/BaseReader.cc index 0f633215..d1cc8d94 100644 --- a/src/OpenMesh/Core/IO/reader/BaseReader.cc +++ b/src/OpenMesh/Core/IO/reader/BaseReader.cc @@ -49,14 +49,11 @@ //=== INCLUDES ================================================================ -#include #include -#include -#include + #if defined(OM_CC_MIPS) # include #else -# include #endif diff --git a/src/OpenMesh/Core/IO/reader/OBJReader.cc b/src/OpenMesh/Core/IO/reader/OBJReader.cc index edb66a80..a9247c35 100644 --- a/src/OpenMesh/Core/IO/reader/OBJReader.cc +++ b/src/OpenMesh/Core/IO/reader/OBJReader.cc @@ -53,7 +53,6 @@ // OpenMesh #include #include -#include #include #include // STL @@ -63,19 +62,13 @@ #elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460) # include #else -# include using std::isspace; #endif #ifndef WIN32 -#include #endif -#include #include -#include -#include -#include //=== NAMESPACES ============================================================== diff --git a/src/OpenMesh/Core/IO/reader/OFFReader.cc b/src/OpenMesh/Core/IO/reader/OFFReader.cc index 062bbc23..fa02960c 100644 --- a/src/OpenMesh/Core/IO/reader/OFFReader.cc +++ b/src/OpenMesh/Core/IO/reader/OFFReader.cc @@ -56,13 +56,10 @@ #include #include #include -#include #include #include // #include -#include - //STL #include #include @@ -74,12 +71,10 @@ #elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460) # include #else -# include using std::isspace; #endif #ifndef WIN32 -#include #endif //=== NAMESPACES ============================================================== diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index 33855512..31e590e7 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -54,10 +54,8 @@ #include #include #include -#include #include #include -#include //STL #include @@ -65,7 +63,6 @@ #include #ifndef WIN32 -#include #endif //=== NAMESPACES ============================================================== diff --git a/src/OpenMesh/Core/IO/reader/STLReader.cc b/src/OpenMesh/Core/IO/reader/STLReader.cc index 90631c70..8e4b9b63 100644 --- a/src/OpenMesh/Core/IO/reader/STLReader.cc +++ b/src/OpenMesh/Core/IO/reader/STLReader.cc @@ -57,12 +57,9 @@ #include // OpenMesh -#include #include #include #include -#include -#include //=== NAMESPACES ============================================================== diff --git a/src/OpenMesh/Core/IO/writer/BaseWriter.cc b/src/OpenMesh/Core/IO/writer/BaseWriter.cc index e20b7d8c..7b7f29b6 100644 --- a/src/OpenMesh/Core/IO/writer/BaseWriter.cc +++ b/src/OpenMesh/Core/IO/writer/BaseWriter.cc @@ -50,14 +50,11 @@ //=== INCLUDES ================================================================ -#include #include -#include -#include + #if defined(OM_CC_MIPS) # include #else -# include #endif diff --git a/src/OpenMesh/Core/IO/writer/OBJWriter.cc b/src/OpenMesh/Core/IO/writer/OBJWriter.cc index 6750add8..dc032769 100644 --- a/src/OpenMesh/Core/IO/writer/OBJWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OBJWriter.cc @@ -55,11 +55,9 @@ #include // OpenMesh -#include #include #include #include -#include #include //=== NAMESPACES ============================================================== diff --git a/src/OpenMesh/Core/IO/writer/OFFWriter.cc b/src/OpenMesh/Core/IO/writer/OFFWriter.cc index 851f3581..c0d2b114 100644 --- a/src/OpenMesh/Core/IO/writer/OFFWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OFFWriter.cc @@ -57,8 +57,6 @@ #include #include -#include - //=== NAMESPACES ============================================================== diff --git a/src/OpenMesh/Core/IO/writer/OMWriter.cc b/src/OpenMesh/Core/IO/writer/OMWriter.cc index b6004f4e..efb25147 100644 --- a/src/OpenMesh/Core/IO/writer/OMWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc @@ -60,13 +60,10 @@ #endif #include -#include #include // -------------------- OpenMesh #include -#include -#include #include #include diff --git a/src/OpenMesh/Core/IO/writer/PLYWriter.cc b/src/OpenMesh/Core/IO/writer/PLYWriter.cc index 68c78747..0314b5a8 100644 --- a/src/OpenMesh/Core/IO/writer/PLYWriter.cc +++ b/src/OpenMesh/Core/IO/writer/PLYWriter.cc @@ -50,15 +50,11 @@ //== INCLUDES ================================================================= #include -#include #include #include #include #include #include -#include - -#include #include diff --git a/src/OpenMesh/Core/IO/writer/STLWriter.cc b/src/OpenMesh/Core/IO/writer/STLWriter.cc index 3040ce66..503fa03b 100644 --- a/src/OpenMesh/Core/IO/writer/STLWriter.cc +++ b/src/OpenMesh/Core/IO/writer/STLWriter.cc @@ -54,7 +54,6 @@ #include // OpenMesh -#include #include #include #include diff --git a/src/OpenMesh/Core/IO/writer/VTKWriter.cc b/src/OpenMesh/Core/IO/writer/VTKWriter.cc index 18d7e059..a178ce5f 100644 --- a/src/OpenMesh/Core/IO/writer/VTKWriter.cc +++ b/src/OpenMesh/Core/IO/writer/VTKWriter.cc @@ -3,11 +3,9 @@ #include #include -#include #include #include #include -#include #include //=== NAMESPACES ============================================================== diff --git a/src/OpenMesh/Core/Mesh/TriConnectivity.cc b/src/OpenMesh/Core/Mesh/TriConnectivity.cc index b0601a80..5567c73b 100644 --- a/src/OpenMesh/Core/Mesh/TriConnectivity.cc +++ b/src/OpenMesh/Core/Mesh/TriConnectivity.cc @@ -50,7 +50,6 @@ // CLASS TriMeshT - IMPLEMENTATION #include -#include namespace OpenMesh { diff --git a/src/OpenMesh/Core/Utils/BaseProperty.cc b/src/OpenMesh/Core/Utils/BaseProperty.cc index 3e9b3cba..92de7b6b 100644 --- a/src/OpenMesh/Core/Utils/BaseProperty.cc +++ b/src/OpenMesh/Core/Utils/BaseProperty.cc @@ -47,7 +47,6 @@ \*===========================================================================*/ #include -#include namespace OpenMesh { diff --git a/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc b/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc index c7cadb2a..83222b61 100644 --- a/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc +++ b/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc @@ -59,7 +59,6 @@ #include -#include //== NAMESPACES =============================================================== diff --git a/src/OpenMesh/Tools/Utils/Gnuplot.cc b/src/OpenMesh/Tools/Utils/Gnuplot.cc index f0cebe52..a70ca1ad 100644 --- a/src/OpenMesh/Tools/Utils/Gnuplot.cc +++ b/src/OpenMesh/Tools/Utils/Gnuplot.cc @@ -46,8 +46,8 @@ #endif #ifndef WIN32 - #include - #include + +#include #else #ifdef __MINGW32__ #include diff --git a/src/OpenMesh/Tools/Utils/conio.cc b/src/OpenMesh/Tools/Utils/conio.cc index a9423f81..3a7c04ee 100644 --- a/src/OpenMesh/Tools/Utils/conio.cc +++ b/src/OpenMesh/Tools/Utils/conio.cc @@ -46,7 +46,6 @@ * * \*===========================================================================*/ -#include #include // ----------------------------------------------------------------- MSVC Compiler ---- @@ -92,7 +91,6 @@ int getche() { return ::getche(); } #endif #include /* tcsetattr() */ #include /* ioctl() */ -#include /* struct timeval */ namespace OpenMesh { namespace Utils { diff --git a/src/OpenMesh/Tools/Utils/conio.hh b/src/OpenMesh/Tools/Utils/conio.hh index 1e1d01eb..b4db158f 100644 --- 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 + namespace OpenMesh { namespace Utils { // ---------------------------------------------------------------------------- diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc index af15a07c..329397e6 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc +++ b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc @@ -1,42 +1,42 @@ -/* ========================================================================= * - * * - * 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 #ifndef WIN32 -#include -#include #else #if defined(__MINGW32__) #include diff --git a/src/Python/Bindings.cc b/src/Python/Bindings.cc index 2015618e..28b26dcc 100644 --- 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"