diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-08 21:48:10 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-08 21:48:10 +0000 |
commit | 376c2a0dbde0decffb3f37146071368ccb3836a7 (patch) | |
tree | 2ce4fc8adbc62217bc373c5ed8753de988b3436f /src/GudhUI | |
parent | cd2e83819689afd2cd1bc76810282111cf5cd59d (diff) |
cpplint fixes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@845 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 8b15f0805527b494f3a57625de5c69d836b287dd
Diffstat (limited to 'src/GudhUI')
-rw-r--r-- | src/GudhUI/utils/Edge_collapsor.h | 6 | ||||
-rw-r--r-- | src/GudhUI/utils/Edge_contractor.h | 2 | ||||
-rw-r--r-- | src/GudhUI/utils/Is_manifold.h | 4 | ||||
-rw-r--r-- | src/GudhUI/utils/Vertex_collapsor.h | 2 | ||||
-rw-r--r-- | src/GudhUI/view/Viewer.h | 6 | ||||
-rw-r--r-- | src/GudhUI/view/Viewer_instructor.h | 6 |
6 files changed, 14 insertions, 12 deletions
diff --git a/src/GudhUI/utils/Edge_collapsor.h b/src/GudhUI/utils/Edge_collapsor.h index fcf2a248..151e9b01 100644 --- a/src/GudhUI/utils/Edge_collapsor.h +++ b/src/GudhUI/utils/Edge_collapsor.h @@ -21,8 +21,8 @@ * */ -#ifndef UTILS_COLLAPSOR_H_ -#define UTILS_COLLAPSOR_H_ +#ifndef UTILS_EDGE_COLLAPSOR_H_ +#define UTILS_EDGE_COLLAPSOR_H_ #include <list> #include "utils/Edge_contractor.h" @@ -94,4 +94,4 @@ template<typename SkBlComplex> class Edge_collapsor { } }; -#endif // UTILS_COLLAPSOR_H_ +#endif // UTILS_EDGE_COLLAPSOR_H_ diff --git a/src/GudhUI/utils/Edge_contractor.h b/src/GudhUI/utils/Edge_contractor.h index 053aac04..45079a40 100644 --- a/src/GudhUI/utils/Edge_contractor.h +++ b/src/GudhUI/utils/Edge_contractor.h @@ -94,4 +94,4 @@ template<typename SkBlComplex> class Edge_contractor { } }; -#endif /* EDGE_CONTRACTOR_H_ */ +#endif // UTILS_EDGE_CONTRACTOR_H_ diff --git a/src/GudhUI/utils/Is_manifold.h b/src/GudhUI/utils/Is_manifold.h index 1b25df34..b6b19ee0 100644 --- a/src/GudhUI/utils/Is_manifold.h +++ b/src/GudhUI/utils/Is_manifold.h @@ -56,7 +56,7 @@ template<typename SkBlComplex> class Is_manifold { dim = local_dimension(v); break; } - //check that the link of every vertex is a dim-1 sphere + // check that the link of every vertex is a dim-1 sphere for (auto v : input_complex_.vertex_range()) { if (!is_k_sphere(v, dim - 1)) { res = false; @@ -90,7 +90,7 @@ template<typename SkBlComplex> class Is_manifold { if (complex.empty()) return -1; if (complex.num_blockers() != 1) return -2; - //necessary and sufficient condition : there exists a unique blocker that passes through all vertices + // necessary and sufficient condition : there exists a unique blocker that passes through all vertices auto first_blocker = *(complex.const_blocker_range().begin()); if (first_blocker->dimension() + 1 != complex.num_vertices()) diff --git a/src/GudhUI/utils/Vertex_collapsor.h b/src/GudhUI/utils/Vertex_collapsor.h index be03c765..2b36cb3a 100644 --- a/src/GudhUI/utils/Vertex_collapsor.h +++ b/src/GudhUI/utils/Vertex_collapsor.h @@ -24,6 +24,8 @@ #ifndef UTILS_VERTEX_COLLAPSOR_H_ #define UTILS_VERTEX_COLLAPSOR_H_ +#include <list> + #include "utils/Edge_contractor.h" #include "utils/Furthest_point_epsilon_net.h" #include "utils/UI_utils.h" diff --git a/src/GudhUI/view/Viewer.h b/src/GudhUI/view/Viewer.h index 99bd63e4..276ccd3c 100644 --- a/src/GudhUI/view/Viewer.h +++ b/src/GudhUI/view/Viewer.h @@ -21,8 +21,8 @@ *
*/
-#ifndef VIEW_VIEWER_H
-#define VIEW_VIEWER_H
+#ifndef VIEW_VIEWER_H_
+#define VIEW_VIEWER_H_
// Workaround for moc-qt4 not parsing boost headers
#include <CGAL/config.h>
@@ -117,4 +117,4 @@ class Viewer : public QGLViewer { void click(const Point_3& position);
};
-#endif // VIEW_VIEWER_H
+#endif // VIEW_VIEWER_H_
diff --git a/src/GudhUI/view/Viewer_instructor.h b/src/GudhUI/view/Viewer_instructor.h index e1c6af8b..31a1d273 100644 --- a/src/GudhUI/view/Viewer_instructor.h +++ b/src/GudhUI/view/Viewer_instructor.h @@ -21,8 +21,8 @@ *
*/
-#ifndef VIEW_VIEWER_INSTRUCTOR_H
-#define VIEW_VIEWER_INSTRUCTOR_H
+#ifndef VIEW_VIEWER_INSTRUCTOR_H_
+#define VIEW_VIEWER_INSTRUCTOR_H_
// todo do a viewer instructor that have directely a pointer to a QGLviewer and buffer ot not triangles
@@ -114,4 +114,4 @@ class Viewer_instructor : public QWidget { void change_light();
};
-#endif // VIEW_VIEWER_INSTRUCTOR_H
+#endif // VIEW_VIEWER_INSTRUCTOR_H_
|