From 1c6b1e4a122b4be45dc6b6bd1941e6c4aa40044b Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Mon, 23 Oct 2023 01:35:11 +0200 Subject: [PATCH] Basic_viewer_qt is no more templated --- Arrangement_on_surface_2/include/CGAL/draw_arrangement_2.h | 2 +- Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h | 6 +++--- .../include/CGAL/draw_periodic_2_triangulation_2.h | 2 +- Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Arrangement_on_surface_2/include/CGAL/draw_arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/draw_arrangement_2.h index 86edc7fa9e0..6aa3b9fcd1c 100644 --- a/Arrangement_on_surface_2/include/CGAL/draw_arrangement_2.h +++ b/Arrangement_on_surface_2/include/CGAL/draw_arrangement_2.h @@ -50,7 +50,7 @@ struct Default_color_generator { // Viewer class for`< Polygon_2 template -class Aos_2_basic_viewer_qt : public Basic_viewer_qt { +class Aos_2_basic_viewer_qt : public Basic_viewer_qt { using Aos = ArrangementOnSurface_2; using Color_generator = ColorGenerator; using Base = Basic_viewer_qt; diff --git a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h index dae70337aea..376bf8540e2 100644 --- a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h +++ b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h @@ -112,10 +112,10 @@ void compute_elements(const PWH& pwh, #ifdef CGAL_USE_BASIC_VIEWER -template -class Polygon_set_2_basic_viewer_qt : public Basic_viewer_qt +template +class Polygon_set_2_basic_viewer_qt : public Basic_viewer_qt { - using Base = Basic_viewer_qt; + using Base = Basic_viewer_qt; using Ps = PolygonSet_2; using Pwh = typename Ps::Polygon_with_holes_2; using Pgn = typename Ps::Polygon_2; diff --git a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h index 381031c47b7..fb86c03e7a0 100644 --- a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h @@ -247,7 +247,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2, { // Here we define the std::function to capture key pressed. app.basic_viewer().on_key_pressed= - [&ap2t2, &gs_options] (QKeyEvent* e, CGAL::Basic_viewer_qt* basic_viewer) -> bool + [&ap2t2, &gs_options] (QKeyEvent* e, CGAL::Basic_viewer_qt* basic_viewer) -> bool { const ::Qt::KeyboardModifiers modifiers = e->modifiers(); if ((e->key() == ::Qt::Key_D) && (modifiers == ::Qt::NoButton)) diff --git a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h index f14c9403412..2517c302a06 100644 --- a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h @@ -391,7 +391,7 @@ void draw(const CGAL_VORONOI_TYPE& av2, { // Here we define the std::function to capture key pressed. app.basic_viewer().on_key_pressed= - [&av2, &gs_options] (QKeyEvent* e, CGAL::Basic_viewer_qt* basic_viewer) -> bool + [&av2, &gs_options] (QKeyEvent* e, CGAL::Basic_viewer_qt* basic_viewer) -> bool { const ::Qt::KeyboardModifiers modifiers = e->modifiers(); if ((e->key() == ::Qt::Key_R) && (modifiers == ::Qt::NoButton))