diff --git a/vcg/complex/algorithms/attribute_seam.h b/vcg/complex/algorithms/attribute_seam.h index 55f84af6..ff121d72 100644 --- a/vcg/complex/algorithms/attribute_seam.h +++ b/vcg/complex/algorithms/attribute_seam.h @@ -177,7 +177,6 @@ class AttributeSeam typedef typename src_trimesh_t::VertexIterator src_vertex_i; typedef typename src_trimesh_t::FaceType src_face_t; typedef typename src_trimesh_t::FaceIterator src_face_i; - typedef typename src_trimesh_t::VertContainer src_vertex_container_t; typedef vcg::tri::Allocator src_mesh_allocator_t; typedef typename src_mesh_allocator_t :: template PointerUpdater src_pointer_updater_t; @@ -263,7 +262,6 @@ class AttributeSeam typedef typename src_trimesh_t::FaceType src_face_t; typedef typename src_trimesh_t::ConstFaceIterator src_face_ci; - typedef typename dst_trimesh_t::VertContainer dst_vertex_container_t; typedef typename dst_trimesh_t::VertexType dst_vertex_t; typedef typename dst_trimesh_t::VertexIterator dst_vertex_i; typedef typename dst_trimesh_t::FaceType dst_face_t; diff --git a/vcg/complex/algorithms/clean.h b/vcg/complex/algorithms/clean.h index fe21552f..f848499d 100644 --- a/vcg/complex/algorithms/clean.h +++ b/vcg/complex/algorithms/clean.h @@ -26,16 +26,10 @@ // VCG headers #include -#include -#include -#include #include #include #include -#include -#include #include -#include #include namespace vcg { diff --git a/vcg/complex/algorithms/clustering.h b/vcg/complex/algorithms/clustering.h index f43e73b2..8e2420f6 100644 --- a/vcg/complex/algorithms/clustering.h +++ b/vcg/complex/algorithms/clustering.h @@ -27,12 +27,10 @@ #include #include #include -#include #include #include #include -#include #include #include diff --git a/vcg/complex/algorithms/convex_hull.h b/vcg/complex/algorithms/convex_hull.h index e31df329..ebe660da 100644 --- a/vcg/complex/algorithms/convex_hull.h +++ b/vcg/complex/algorithms/convex_hull.h @@ -25,8 +25,7 @@ #include #include -#include -#include +#include #include namespace vcg diff --git a/vcg/complex/algorithms/create/advancing_front.h b/vcg/complex/algorithms/create/advancing_front.h index 5bc92ede..a6de09ab 100644 --- a/vcg/complex/algorithms/create/advancing_front.h +++ b/vcg/complex/algorithms/create/advancing_front.h @@ -26,8 +26,6 @@ #include #include -#include -#include namespace vcg { namespace tri { diff --git a/vcg/complex/algorithms/create/platonic.h b/vcg/complex/algorithms/create/platonic.h index f696c964..0ef6fe19 100644 --- a/vcg/complex/algorithms/create/platonic.h +++ b/vcg/complex/algorithms/create/platonic.h @@ -26,9 +26,7 @@ #include #include -#include #include -#include #include #include #include diff --git a/vcg/complex/algorithms/create/resampler.h b/vcg/complex/algorithms/create/resampler.h index b2e3fa9f..9d6b6f3a 100644 --- a/vcg/complex/algorithms/create/resampler.h +++ b/vcg/complex/algorithms/create/resampler.h @@ -24,13 +24,11 @@ #define __VCG_MESH_RESAMPLER #include -#include #include #include #include #include #include -#include namespace vcg { namespace tri { diff --git a/vcg/complex/algorithms/intersection.h b/vcg/complex/algorithms/intersection.h index dfc0733f..36fbd148 100644 --- a/vcg/complex/algorithms/intersection.h +++ b/vcg/complex/algorithms/intersection.h @@ -27,7 +27,6 @@ #include #include #include -#include #ifndef __VCGLIB_INTERSECTION_TRI_MESH diff --git a/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h b/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h index 35425c98..e1edbfba 100644 --- a/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h +++ b/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h @@ -25,9 +25,6 @@ #define __VCG_TRIMESHCOLLAPSE_QUADRIC__ #include -#include -#include -#include #include #include #include diff --git a/vcg/complex/algorithms/nring.h b/vcg/complex/algorithms/nring.h index cddc5599..6d1318f5 100644 --- a/vcg/complex/algorithms/nring.h +++ b/vcg/complex/algorithms/nring.h @@ -24,7 +24,6 @@ #define RINGWALKER_H #include -#include namespace vcg { diff --git a/vcg/complex/algorithms/parametrization/tangent_field_operators.h b/vcg/complex/algorithms/parametrization/tangent_field_operators.h index e1ad64fb..0db404ee 100644 --- a/vcg/complex/algorithms/parametrization/tangent_field_operators.h +++ b/vcg/complex/algorithms/parametrization/tangent_field_operators.h @@ -22,8 +22,6 @@ ****************************************************************************/ #include #include -#include -#include #ifndef VCG_TANGENT_FIELD_OPERATORS #define VCG_TANGENT_FIELD_OPERATORS diff --git a/vcg/complex/algorithms/point_sampling.h b/vcg/complex/algorithms/point_sampling.h index b99e9587..5bb2cf30 100644 --- a/vcg/complex/algorithms/point_sampling.h +++ b/vcg/complex/algorithms/point_sampling.h @@ -42,10 +42,8 @@ sampling strategies (montecarlo, stratified etc). #include #include #include -#include #include #include -#include #include #include namespace vcg diff --git a/vcg/complex/algorithms/polygon_polychord_collapse.h b/vcg/complex/algorithms/polygon_polychord_collapse.h index 2e3d82e5..329d4c79 100644 --- a/vcg/complex/algorithms/polygon_polychord_collapse.h +++ b/vcg/complex/algorithms/polygon_polychord_collapse.h @@ -23,16 +23,8 @@ #ifndef POLYGON_POLYCHORD_COLLAPSE_H #define POLYGON_POLYCHORD_COLLAPSE_H -#include #include -#if __cplusplus >= 201103L - #include -#else - #include -#endif -#include -#include -#include +#include #include #include diff --git a/vcg/complex/algorithms/polygonal_algorithms.h b/vcg/complex/algorithms/polygonal_algorithms.h index ced5214b..7ea335da 100644 --- a/vcg/complex/algorithms/polygonal_algorithms.h +++ b/vcg/complex/algorithms/polygonal_algorithms.h @@ -28,7 +28,6 @@ #include #include #include -#include #include //define a temporary triangle mesh type diff --git a/vcg/complex/algorithms/refine.h b/vcg/complex/algorithms/refine.h index 7582de16..8f3539af 100644 --- a/vcg/complex/algorithms/refine.h +++ b/vcg/complex/algorithms/refine.h @@ -28,10 +28,6 @@ #include #include #include -#include -#include -#include -#include #include #include #include diff --git a/vcg/complex/algorithms/refine_loop.h b/vcg/complex/algorithms/refine_loop.h index 33f13d53..6380a49b 100644 --- a/vcg/complex/algorithms/refine_loop.h +++ b/vcg/complex/algorithms/refine_loop.h @@ -34,9 +34,6 @@ #include #include #include -#include -#include -#include #include diff --git a/vcg/complex/algorithms/stat.h b/vcg/complex/algorithms/stat.h index 60a5689b..d4b8dd81 100644 --- a/vcg/complex/algorithms/stat.h +++ b/vcg/complex/algorithms/stat.h @@ -28,11 +28,8 @@ // VCG headers #include -#include -#include #include #include -#include #include diff --git a/vcg/complex/algorithms/update/color.h b/vcg/complex/algorithms/update/color.h index 95ddc5aa..1e91839e 100644 --- a/vcg/complex/algorithms/update/color.h +++ b/vcg/complex/algorithms/update/color.h @@ -24,7 +24,6 @@ #ifndef __VCG_TRI_UPDATE_COLOR #define __VCG_TRI_UPDATE_COLOR -#include #include #include #include diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h index 9afd2fd0..918d5ad7 100644 --- a/vcg/complex/algorithms/update/curvature.h +++ b/vcg/complex/algorithms/update/curvature.h @@ -25,8 +25,6 @@ #define VCGLIB_UPDATE_CURVATURE_ #include -#include -#include #include #include #include diff --git a/vcg/complex/algorithms/update/fitmaps.h b/vcg/complex/algorithms/update/fitmaps.h index 3105db66..dbc7cf51 100644 --- a/vcg/complex/algorithms/update/fitmaps.h +++ b/vcg/complex/algorithms/update/fitmaps.h @@ -27,7 +27,6 @@ #include #include -#include #include #include #include diff --git a/vcg/complex/algorithms/update/flag.h b/vcg/complex/algorithms/update/flag.h index 817ba662..98f8e673 100644 --- a/vcg/complex/algorithms/update/flag.h +++ b/vcg/complex/algorithms/update/flag.h @@ -23,8 +23,6 @@ #ifndef __VCG_TRI_UPDATE_FLAGS #define __VCG_TRI_UPDATE_FLAGS -#include - namespace vcg { namespace tri { /// \ingroup trimesh diff --git a/vcg/complex/algorithms/update/normal.h b/vcg/complex/algorithms/update/normal.h index 79358111..990a16e6 100644 --- a/vcg/complex/algorithms/update/normal.h +++ b/vcg/complex/algorithms/update/normal.h @@ -24,10 +24,7 @@ #ifndef __VCG_TRI_UPDATE_NORMALS #define __VCG_TRI_UPDATE_NORMALS -#include #include -#include -#include namespace vcg { namespace tri { diff --git a/vcg/complex/algorithms/update/quality.h b/vcg/complex/algorithms/update/quality.h index 05327364..e41c66db 100644 --- a/vcg/complex/algorithms/update/quality.h +++ b/vcg/complex/algorithms/update/quality.h @@ -22,9 +22,6 @@ ****************************************************************************/ #ifndef __VCG_TRI_UPDATE_QUALITY #define __VCG_TRI_UPDATE_QUALITY -#include -#include -#include #include namespace vcg { diff --git a/vcg/complex/algorithms/update/selection.h b/vcg/complex/algorithms/update/selection.h index ef97bcaa..1fefe694 100644 --- a/vcg/complex/algorithms/update/selection.h +++ b/vcg/complex/algorithms/update/selection.h @@ -23,9 +23,6 @@ #ifndef __VCG_TRI_UPDATE_SELECTION #define __VCG_TRI_UPDATE_SELECTION -#include -#include - namespace vcg { namespace tri { /// \ingroup trimesh diff --git a/vcg/complex/algorithms/update/topology.h b/vcg/complex/algorithms/update/topology.h index c796f768..072528d6 100644 --- a/vcg/complex/algorithms/update/topology.h +++ b/vcg/complex/algorithms/update/topology.h @@ -23,11 +23,6 @@ #ifndef __VCG_TRI_UPDATE_TOPOLOGY #define __VCG_TRI_UPDATE_TOPOLOGY -#include -#include -#include -#include -#include namespace vcg { namespace tri { diff --git a/vcg/complex/complex.h b/vcg/complex/complex.h index 28f7458f..0b7b7226 100644 --- a/vcg/complex/complex.h +++ b/vcg/complex/complex.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -48,6 +49,9 @@ #include #include #include +#include +#include +#include #include #include diff --git a/vcg/container/simple_temporary_data.h b/vcg/container/simple_temporary_data.h index 011726d5..0e861edf 100644 --- a/vcg/container/simple_temporary_data.h +++ b/vcg/container/simple_temporary_data.h @@ -24,8 +24,6 @@ #ifndef __VCGLIB_SIMPLE__ #define __VCGLIB_SIMPLE__ -#include - namespace vcg { class SimpleTempDataBase{ diff --git a/vcg/math/gen_normal.h b/vcg/math/gen_normal.h index 78d40b6d..ad5e71aa 100644 --- a/vcg/math/gen_normal.h +++ b/vcg/math/gen_normal.h @@ -29,8 +29,6 @@ $Log: gen_normal.h,v $ #ifndef __VCG_GEN_NORMAL #define __VCG_GEN_NORMAL -#include - namespace vcg { template diff --git a/vcg/math/histogram.h b/vcg/math/histogram.h index 2edfb578..829106ab 100644 --- a/vcg/math/histogram.h +++ b/vcg/math/histogram.h @@ -23,8 +23,6 @@ #ifndef __VCG_HISTOGRAM #define __VCG_HISTOGRAM -#include -#include #include #include #include diff --git a/vcg/simplex/edge/pos.h b/vcg/simplex/edge/pos.h index 58a5d936..2b278f53 100644 --- a/vcg/simplex/edge/pos.h +++ b/vcg/simplex/edge/pos.h @@ -20,18 +20,6 @@ * for more details. * * * ****************************************************************************/ -/**************************************************************************** - History - -$Log: not supported by cvs2svn $ -Revision 1.2 2004/05/10 14:40:47 ganovelli -name of adhacency function updated - -Revision 1.1 2004/05/10 14:01:56 ganovelli -created - -****************************************************************************/ - #ifndef __VCG_EDGE_POS #define __VCG_EDGE_POS diff --git a/vcg/simplex/edge/topology.h b/vcg/simplex/edge/topology.h index 87cf13f0..9001f821 100644 --- a/vcg/simplex/edge/topology.h +++ b/vcg/simplex/edge/topology.h @@ -24,10 +24,6 @@ #ifndef _VCG_EDGE_TOPOLOGY #define _VCG_EDGE_TOPOLOGY -#include -#include -#include - namespace vcg { namespace edge { /** \addtogroup edge */ diff --git a/vcg/simplex/face/pos.h b/vcg/simplex/face/pos.h index 9f0d9946..1fff3d67 100644 --- a/vcg/simplex/face/pos.h +++ b/vcg/simplex/face/pos.h @@ -29,8 +29,6 @@ #ifndef __VCG_FACE_POS #define __VCG_FACE_POS -#include - namespace vcg { namespace face { diff --git a/vcg/simplex/face/topology.h b/vcg/simplex/face/topology.h index 47c1446b..598501c5 100644 --- a/vcg/simplex/face/topology.h +++ b/vcg/simplex/face/topology.h @@ -24,9 +24,6 @@ #ifndef _VCG_FACE_TOPOLOGY #define _VCG_FACE_TOPOLOGY -#include -#include - namespace vcg { namespace face { /** \addtogroup face */ diff --git a/vcg/space/box2.h b/vcg/space/box2.h index 7176eff9..5096386b 100644 --- a/vcg/space/box2.h +++ b/vcg/space/box2.h @@ -24,8 +24,6 @@ #ifndef __VCGLIB_BOX2 #define __VCGLIB_BOX2 -#include -#include #include #include diff --git a/vcg/space/index/grid_static_obj.h b/vcg/space/index/grid_static_obj.h index b8bd8678..a0922bee 100644 --- a/vcg/space/index/grid_static_obj.h +++ b/vcg/space/index/grid_static_obj.h @@ -19,33 +19,11 @@ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * for more details. * * * -****************************************************************************/ -/**************************************************************************** - History - -$Log: not supported by cvs2svn $ -Revision 1.4 2006/09/27 08:49:32 spinelli -bug fix, add return type to Init - -Revision 1.3 2006/08/23 15:20:14 marfr960 -corrected minor bugs - -Revision 1.2 2005/12/02 00:29:00 cignoni -updated the templates of BasicGrid - -Revision 1.1 2005/07/28 08:41:00 cignoni -First working version - -Revision 1.13 2005/04/14 17:23:08 ponchio -*** empty log message *** - ****************************************************************************/ #ifndef __VCGLIB_UGRID_OBJ #define __VCGLIB_UGRID_OBJ -#include -#include #include #include diff --git a/vcg/space/index/grid_static_ptr.h b/vcg/space/index/grid_static_ptr.h index 197f6814..90340c4b 100644 --- a/vcg/space/index/grid_static_ptr.h +++ b/vcg/space/index/grid_static_ptr.h @@ -24,8 +24,6 @@ #ifndef __VCGLIB_UGRID #define __VCGLIB_UGRID -#include -#include #include #include diff --git a/vcg/space/outline2_packer.h b/vcg/space/outline2_packer.h index 823457e8..476ca956 100644 --- a/vcg/space/outline2_packer.h +++ b/vcg/space/outline2_packer.h @@ -26,8 +26,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/wrap/dae/util_dae.h b/wrap/dae/util_dae.h index 33cdb6e3..51aa400b 100644 --- a/wrap/dae/util_dae.h +++ b/wrap/dae/util_dae.h @@ -24,7 +24,6 @@ #define __VCGLIB_UTILDAE -#include #include #include #include