From 04753381e5e91cd9dfefdba88f01bfd7928e0850 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 12 Jan 2021 13:22:34 +0100 Subject: [PATCH] Rename file and add ::Qt --- AABB_tree/demo/AABB_tree/AABB_demo.cpp | 4 ++-- Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp | 4 ++-- .../demo/Circular_kernel_3/Circular_kernel_3.cpp | 4 ++-- .../Qt/{Context_initialization.h => init_ogl_context.h} | 6 ++++-- .../demo/Linear_cell_complex/Linear_cell_complex_3_demo.cpp | 4 ++-- Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h | 4 ++-- Nef_3/include/CGAL/draw_nef_3.h | 4 ++-- .../include/CGAL/draw_periodic_2_triangulation_2.h | 4 ++-- .../periodic_3_triangulation_3_demo.cpp | 4 ++-- .../demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp | 4 ++-- Point_set_3/include/CGAL/draw_point_set_3.h | 4 ++-- Polygon/include/CGAL/draw_polygon_2.h | 4 ++-- Polygon/include/CGAL/draw_polygon_with_holes_2.h | 4 ++-- Polyhedron/include/CGAL/draw_polyhedron.h | 4 ++-- .../demo/Principal_component_analysis/PCA_demo.cpp | 4 ++-- Surface_mesh/include/CGAL/draw_surface_mesh.h | 4 ++-- .../include/CGAL/draw_face_graph_with_paths.h | 4 ++-- Triangulation_2/include/CGAL/draw_triangulation_2.h | 4 ++-- Triangulation_3/demo/Triangulation_3/T3_demo.cpp | 4 ++-- Triangulation_3/include/CGAL/draw_triangulation_3.h | 4 ++-- Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h | 4 ++-- 21 files changed, 44 insertions(+), 42 deletions(-) rename GraphicsView/include/CGAL/Qt/{Context_initialization.h => init_ogl_context.h} (96%) diff --git a/AABB_tree/demo/AABB_tree/AABB_demo.cpp b/AABB_tree/demo/AABB_tree/AABB_demo.cpp index 4e643e352f3..018e0f69c14 100644 --- a/AABB_tree/demo/AABB_tree/AABB_demo.cpp +++ b/AABB_tree/demo/AABB_tree/AABB_demo.cpp @@ -19,12 +19,12 @@ #include #include #include -#include +#include int main(int argc, char **argv) { - CGAL::init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); QApplication app(argc, argv); app.setOrganizationDomain("inria.fr"); app.setOrganizationName("INRIA"); diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp b/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp index 8c9baa63e53..784ee1af57f 100644 --- a/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp +++ b/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp @@ -5,11 +5,11 @@ #include -#include +#include int main(int argc, char** argv) { - CGAL::init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); QApplication application(argc,argv); application.setOrganizationDomain("geometryfactory.com"); diff --git a/Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp b/Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp index 72fe7f88c8b..0b41052abad 100644 --- a/Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp +++ b/Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp @@ -1,9 +1,9 @@ #include "Viewer.h" #include -#include +#include int main(int argc, char** argv) { - CGAL::init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); QApplication application(argc,argv); // Instantiate the viewer. Viewer viewer; diff --git a/GraphicsView/include/CGAL/Qt/Context_initialization.h b/GraphicsView/include/CGAL/Qt/init_ogl_context.h similarity index 96% rename from GraphicsView/include/CGAL/Qt/Context_initialization.h rename to GraphicsView/include/CGAL/Qt/init_ogl_context.h index 1ad56f04a79..57198277fe6 100644 --- a/GraphicsView/include/CGAL/Qt/Context_initialization.h +++ b/GraphicsView/include/CGAL/Qt/init_ogl_context.h @@ -15,6 +15,8 @@ namespace CGAL { +namespace Qt +{ inline void init_ogl_context(int major, int minor) { QSurfaceFormat fmt; #ifdef Q_OS_MAC @@ -43,6 +45,6 @@ inline void init_ogl_context(int major, int minor) { setlocale(LC_ALL, "C"); } -} - +} //end Qt +} //end CGAL #endif // CGAL_QT_CONTEXT_INITIALIZATION_H diff --git a/Linear_cell_complex/demo/Linear_cell_complex/Linear_cell_complex_3_demo.cpp b/Linear_cell_complex/demo/Linear_cell_complex/Linear_cell_complex_3_demo.cpp index e27fbb07aad..cd31d859217 100644 --- a/Linear_cell_complex/demo/Linear_cell_complex/Linear_cell_complex_3_demo.cpp +++ b/Linear_cell_complex/demo/Linear_cell_complex/Linear_cell_complex_3_demo.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include // Global random CGAL::Random myrandom; @@ -24,7 +24,7 @@ int main(int argc, char** argv) // std::cout<<"Size of dart: "< -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -405,7 +405,7 @@ void draw(const CGAL_LCC_TYPE& alcc, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"lccviewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Nef_3/include/CGAL/draw_nef_3.h b/Nef_3/include/CGAL/draw_nef_3.h index 1ccdb02415f..1f397471e6c 100644 --- a/Nef_3/include/CGAL/draw_nef_3.h +++ b/Nef_3/include/CGAL/draw_nef_3.h @@ -15,7 +15,7 @@ #include #include -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -254,7 +254,7 @@ void draw(const CGAL_NEF3_TYPE &anef, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc = 1; const char *argv[2] = {"nef_polyhedron_viewer", "\0"}; QApplication app(argc, const_cast(argv)); 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 f0df1f59c34..6e192e321fd 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 @@ -14,7 +14,7 @@ #include #include -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -261,7 +261,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"p2t2_viewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp index b66d053b8ad..2cf672fdb48 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp @@ -1,11 +1,11 @@ #include "MainWindow.h" #include -#include +#include int main(int argc, char *argv[]) { - init_ogl_context(2,1); + CGAL::Qt::init_ogl_context(2,1); QApplication a(argc, argv); MainWindow w; //w.ui->setupUi(w); diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp index 3778226b2f5..ae0074e0bcc 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp +++ b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp @@ -1,12 +1,12 @@ #include "MainWindow.h" #include #include -#include +#include int main(int argc, char** argv) { - CGAL::init_ogl_context(2, 1); + CGAL::Qt::init_ogl_context(2, 1); QApplication application(argc,argv); application.setOrganizationDomain("inria.fr"); diff --git a/Point_set_3/include/CGAL/draw_point_set_3.h b/Point_set_3/include/CGAL/draw_point_set_3.h index c79da404ede..ef02b438a68 100644 --- a/Point_set_3/include/CGAL/draw_point_set_3.h +++ b/Point_set_3/include/CGAL/draw_point_set_3.h @@ -15,7 +15,7 @@ #include #include -#include +#include #ifdef DOXYGEN_RUNNING namespace CGAL { @@ -101,7 +101,7 @@ void draw(const Point_set_3& apointset, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"point_set_viewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Polygon/include/CGAL/draw_polygon_2.h b/Polygon/include/CGAL/draw_polygon_2.h index 7c0b29cde20..fe31f51deca 100644 --- a/Polygon/include/CGAL/draw_polygon_2.h +++ b/Polygon/include/CGAL/draw_polygon_2.h @@ -18,7 +18,7 @@ #define CGAL_DRAW_POLYGON_2_H #include -#include +#include #ifdef DOXYGEN_RUNNING namespace CGAL { @@ -123,7 +123,7 @@ void draw(const CGAL::Polygon_2& ap2, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"t2_viewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Polygon/include/CGAL/draw_polygon_with_holes_2.h b/Polygon/include/CGAL/draw_polygon_with_holes_2.h index 6cb017d3ef6..0b9d5260c1f 100644 --- a/Polygon/include/CGAL/draw_polygon_with_holes_2.h +++ b/Polygon/include/CGAL/draw_polygon_with_holes_2.h @@ -18,7 +18,7 @@ #define CGAL_DRAW_POLYGON_WITH_HOLES_2_H #include -#include +#include #ifdef DOXYGEN_RUNNING namespace CGAL { @@ -139,7 +139,7 @@ void draw(const CGAL::Polygon_with_holes_2& ap2, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"t2_viewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Polyhedron/include/CGAL/draw_polyhedron.h b/Polyhedron/include/CGAL/draw_polyhedron.h index 4c780145c9e..58610cd5891 100644 --- a/Polyhedron/include/CGAL/draw_polyhedron.h +++ b/Polyhedron/include/CGAL/draw_polyhedron.h @@ -14,7 +14,7 @@ #include #include -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -209,7 +209,7 @@ void draw(const CGAL_POLY_TYPE& apoly, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"polyhedron_viewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp b/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp index 25a3bde8b5f..04b8cf11f13 100644 --- a/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp +++ b/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp @@ -18,11 +18,11 @@ #include "MainWindow.h" #include #include -#include +#include int main(int argc, char **argv) { - CGAL::init_ogl_context(2, 1); + CGAL::Qt::init_ogl_context(2, 1); QApplication app(argc, argv); app.setOrganizationDomain("inria.fr"); diff --git a/Surface_mesh/include/CGAL/draw_surface_mesh.h b/Surface_mesh/include/CGAL/draw_surface_mesh.h index 6ee0239cf98..5ebbc221af3 100644 --- a/Surface_mesh/include/CGAL/draw_surface_mesh.h +++ b/Surface_mesh/include/CGAL/draw_surface_mesh.h @@ -29,7 +29,7 @@ void draw(const SM& asm); #include #include -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -209,7 +209,7 @@ void draw(const Surface_mesh& amesh, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"surface_mesh_viewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h index 819297cc7d0..dfa4af1cc26 100644 --- a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h +++ b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -410,7 +410,7 @@ void draw(const Mesh& alcc, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"lccviewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Triangulation_2/include/CGAL/draw_triangulation_2.h b/Triangulation_2/include/CGAL/draw_triangulation_2.h index 7b854abb889..a5a0f5331d2 100644 --- a/Triangulation_2/include/CGAL/draw_triangulation_2.h +++ b/Triangulation_2/include/CGAL/draw_triangulation_2.h @@ -14,7 +14,7 @@ #include #include -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -145,7 +145,7 @@ void draw(const CGAL_T2_TYPE& at2, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"t2_viewer","\0"}; QApplication app(argc,const_cast(argv)); diff --git a/Triangulation_3/demo/Triangulation_3/T3_demo.cpp b/Triangulation_3/demo/Triangulation_3/T3_demo.cpp index b590849fb2e..aef465639ff 100644 --- a/Triangulation_3/demo/Triangulation_3/T3_demo.cpp +++ b/Triangulation_3/demo/Triangulation_3/T3_demo.cpp @@ -13,11 +13,11 @@ #include "MainWindow.h" #include -#include +#include int main(int argc, char** argv) { - CGAL::init_ogl_context(2, 1); + CGAL::Qt::init_ogl_context(2, 1); QApplication app(argc, argv); diff --git a/Triangulation_3/include/CGAL/draw_triangulation_3.h b/Triangulation_3/include/CGAL/draw_triangulation_3.h index 1a048c80d5b..4cac6b42526 100644 --- a/Triangulation_3/include/CGAL/draw_triangulation_3.h +++ b/Triangulation_3/include/CGAL/draw_triangulation_3.h @@ -14,7 +14,7 @@ #include #include -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -151,7 +151,7 @@ void draw(const CGAL_T3_TYPE& at3, if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc=1; const char* argv[2]={"t3_viewer","\0"}; QApplication app(argc,const_cast(argv)); 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 b172513a29e..53c38de359e 100644 --- a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h @@ -14,7 +14,7 @@ #include #include -#include +#include #ifdef CGAL_USE_BASIC_VIEWER @@ -317,7 +317,7 @@ void draw(const CGAL_VORONOI_TYPE &av2, #endif if (!cgal_test_suite) { - init_ogl_context(4,3); + CGAL::Qt::init_ogl_context(4,3); int argc = 1; const char *argv[2] = {"voronoi_2_viewer", "\0"}; QApplication app(argc, const_cast(argv));