From 5e78e5b3f16f261f4f4d1d15b3ea7940e17ad0ac Mon Sep 17 00:00:00 2001 From: Pedro Machado Manhaes de Castro Date: Thu, 24 Jul 2008 10:43:12 +0000 Subject: [PATCH] Fix License for examples and demo --- .../Circular_kernel_2/Qt_widget_get_arc.cpp | 9 ++++--- .../Circular_kernel_2/Qt_widget_get_arc.h | 10 ++++---- .../Qt_widget_get_segment.cpp | 7 ++++-- .../Circular_kernel_2/Qt_widget_get_segment.h | 24 ++++++------------- .../demo/Circular_kernel_2/demo.cpp | 10 ++++---- .../demo_Lazy_line_circle.cpp | 12 +++++----- .../demo/Circular_kernel_2/demo_circle.cpp | 12 +++++----- .../demo/Circular_kernel_2/demo_elias.cpp | 12 +++++----- .../demo/Circular_kernel_2/demo_line.cpp | 12 +++++----- .../demo/Circular_kernel_2/demo_viewer.cpp | 11 +++++---- .../Circular_kernel_2/intersecting_arcs.cpp | 24 ------------------- .../demo/Circular_kernel_3/demo_circle.cpp | 15 ++---------- .../demo/Circular_kernel_3/demo_circle.h | 14 ++--------- .../Circular_kernel_3/spherical_kernel_3.cpp | 22 ----------------- 14 files changed, 63 insertions(+), 131 deletions(-) diff --git a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.cpp b/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.cpp index 5226487e133..1cc3b952fa2 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.cpp +++ b/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.cpp @@ -1,8 +1,11 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) and -// Max-Planck-Institute Saarbruecken (Germany). +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). // All rights reserved. // -// Authors : Radu Ursu +// $URL$ +// $Id$ +// +// Authors : Sylvain Pion, Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost // RTD (FET Open) Project under Contract No IST-2000-26473 diff --git a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.h b/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.h index 2e25e4c61e3..87c6a67a059 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.h +++ b/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.h @@ -1,9 +1,11 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) and -// Max-Planck-Institute Saarbruecken (Germany). +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). // All rights reserved. // -// Authors : Sylvain Pion -// Radu Ursu +// $URL$ +// $Id$ +// +// Authors : Sylvain Pion, Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost // RTD (FET Open) Project under Contract No IST-2000-26473 diff --git a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.cpp b/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.cpp index 2d1af2f120a..334cad63d57 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.cpp +++ b/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.cpp @@ -1,7 +1,10 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) and -// Max-Planck-Institute Saarbruecken (Germany). +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). // All rights reserved. // +// $URL$ +// $Id$ +// // Authors : Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost diff --git a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.h b/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.h index cd0190a5f69..df1e922db81 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.h +++ b/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.h @@ -1,25 +1,15 @@ -// Copyright (c) 1997-2000 Utrecht University (The Netherlands), -// ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), -// INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg -// (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), -// and Tel-Aviv University (Israel). All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). +// All rights reserved. // // $URL$ // $Id$ // +// Authors : Radu Ursu // -// Author(s) : Radu Ursu +// Partially supported by the IST Programme of the EU as a Shared-cost +// RTD (FET Open) Project under Contract No IST-2000-26473 +// (CGAL - Effective Computational Geometry for Curves and Surfaces) #ifndef CGAL_QT_WIDGET_GET_SEGMENT_H #define CGAL_QT_WIDGET_GET_SEGMENT_H diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo.cpp b/Circular_kernel_2/demo/Circular_kernel_2/demo.cpp index a66edf21634..d334c18a12d 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/demo.cpp +++ b/Circular_kernel_2/demo/Circular_kernel_2/demo.cpp @@ -1,15 +1,15 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) // All rights reserved. // -// Authors : Monique Teillaud -// Sylvain Pion -// Radu Ursu +// $URL$ +// $Id$ +// +// Authors : Monique Teillaud, Sylvain Pion, Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost // RTD (FET Open) Project under Contract No IST-2000-26473 // (CGAL - Effective Computational Geometry for Curves and Surfaces) - // TODO : // - Add the possibility to input full circles. // - locate the cell containing a point. diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo_Lazy_line_circle.cpp b/Circular_kernel_2/demo/Circular_kernel_2/demo_Lazy_line_circle.cpp index 817e178af8d..55ca30ed350 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/demo_Lazy_line_circle.cpp +++ b/Circular_kernel_2/demo/Circular_kernel_2/demo_Lazy_line_circle.cpp @@ -1,16 +1,16 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) and -// Max-Planck-Institute Saarbruecken (Germany). +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). // All rights reserved. // -// Authors : Monique Teillaud -// Sylvain Pion -// Radu Ursu +// $URL$ +// $Id$ +// +// Authors : Monique Teillaud, Sylvain Pion, Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost // RTD (FET Open) Project under Contract No IST-2000-26473 // (CGAL - Effective Computational Geometry for Curves and Surfaces) - // TODO : // - Add the possibility to input full circles. // - locate the cell containing a point. diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo_circle.cpp b/Circular_kernel_2/demo/Circular_kernel_2/demo_circle.cpp index 72abea3417b..d0a23fc7c22 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/demo_circle.cpp +++ b/Circular_kernel_2/demo/Circular_kernel_2/demo_circle.cpp @@ -1,16 +1,16 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) and -// Max-Planck-Institute Saarbruecken (Germany). +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). // All rights reserved. // -// Authors : Monique Teillaud -// Sylvain Pion -// Radu Ursu +// $URL$ +// $Id$ +// +// Authors : Monique Teillaud, Sylvain Pion, Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost // RTD (FET Open) Project under Contract No IST-2000-26473 // (CGAL - Effective Computational Geometry for Curves and Surfaces) - // TODO : // - Add the possibility to input full circles. // - locate the cell containing a point. diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo_elias.cpp b/Circular_kernel_2/demo/Circular_kernel_2/demo_elias.cpp index 578ff783263..1f68a55334f 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/demo_elias.cpp +++ b/Circular_kernel_2/demo/Circular_kernel_2/demo_elias.cpp @@ -1,16 +1,16 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) and -// Max-Planck-Institute Saarbruecken (Germany). +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). // All rights reserved. // -// Authors : Monique Teillaud -// Sylvain Pion -// Radu Ursu +// $URL$ +// $Id$ +// +// Authors : Monique Teillaud, Sylvain Pion, Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost // RTD (FET Open) Project under Contract No IST-2000-26473 // (CGAL - Effective Computational Geometry for Curves and Surfaces) - // TODO : // - Add the possibility to input full circles. // - locate the cell containing a point. diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo_line.cpp b/Circular_kernel_2/demo/Circular_kernel_2/demo_line.cpp index 92eca72d7a8..2c0de74c506 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/demo_line.cpp +++ b/Circular_kernel_2/demo/Circular_kernel_2/demo_line.cpp @@ -1,16 +1,16 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) and -// Max-Planck-Institute Saarbruecken (Germany). +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). // All rights reserved. // -// Authors : Monique Teillaud -// Sylvain Pion -// Radu Ursu +// $URL$ +// $Id$ +// +// Authors : Monique Teillaud, Sylvain Pion, Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost // RTD (FET Open) Project under Contract No IST-2000-26473 // (CGAL - Effective Computational Geometry for Curves and Surfaces) - // TODO : // - Add the possibility to input full circles. // - locate the cell containing a point. diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo_viewer.cpp b/Circular_kernel_2/demo/Circular_kernel_2/demo_viewer.cpp index 987ddbfb813..832147ac08b 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/demo_viewer.cpp +++ b/Circular_kernel_2/demo/Circular_kernel_2/demo_viewer.cpp @@ -1,10 +1,11 @@ -// Copyright (c) 2003 INRIA Sophia-Antipolis (France) and -// Max-Planck-Institute Saarbruecken (Germany). +// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France) and +// Max-Planck-Institute Saarbruecken (Germany). // All rights reserved. // -// Authors : Monique Teillaud -// Sylvain Pion -// Radu Ursu +// $URL$ +// $Id$ +// +// Authors : Monique Teillaud, Sylvain Pion, Radu Ursu // // Partially supported by the IST Programme of the EU as a Shared-cost // RTD (FET Open) Project under Contract No IST-2000-26473 diff --git a/Circular_kernel_2/examples/Circular_kernel_2/intersecting_arcs.cpp b/Circular_kernel_2/examples/Circular_kernel_2/intersecting_arcs.cpp index 6ab377ad7c2..6c5fa8da77c 100644 --- a/Circular_kernel_2/examples/Circular_kernel_2/intersecting_arcs.cpp +++ b/Circular_kernel_2/examples/Circular_kernel_2/intersecting_arcs.cpp @@ -1,27 +1,3 @@ -// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL -// $Id -// -// Author(s) : Monique Teillaud, Sylvain Pion, Pedro Machado - -// Partially supported by the IST Programme of the EU as a Shared-cost -// RTD (FET Open) Project under Contract No IST-2000-26473 -// (ECG - Effective Computational Geometry for Curves and Surfaces) -// and a STREP (FET Open) Project under Contract No IST-006413 -// (ACS -- Algorithms for Complex Shapes) - #include #include #include diff --git a/Circular_kernel_3/demo/Circular_kernel_3/demo_circle.cpp b/Circular_kernel_3/demo/Circular_kernel_3/demo_circle.cpp index 232b818ad95..cdaa2e55c79 100644 --- a/Circular_kernel_3/demo/Circular_kernel_3/demo_circle.cpp +++ b/Circular_kernel_3/demo/Circular_kernel_3/demo_circle.cpp @@ -1,18 +1,8 @@ // Copyright (c) 2008 INRIA Sophia-Antipolis (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ +// $URL +// $Id // // Author(s) : Monique Teillaud, Sylvain Pion, Pedro Machado, // Julien Hazebrouck, Damien Leroy @@ -20,7 +10,6 @@ // Partially supported by the IST Programme of the EU as a // STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -// moc_source_file: demo_circle.h #include #ifdef CGAL_USE_QT diff --git a/Circular_kernel_3/demo/Circular_kernel_3/demo_circle.h b/Circular_kernel_3/demo/Circular_kernel_3/demo_circle.h index 6a4deb7b622..a7fe07172c6 100644 --- a/Circular_kernel_3/demo/Circular_kernel_3/demo_circle.h +++ b/Circular_kernel_3/demo/Circular_kernel_3/demo_circle.h @@ -1,18 +1,8 @@ // Copyright (c) 2008 INRIA Sophia-Antipolis (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ +// $URL +// $Id // // Author(s) : Monique Teillaud, Sylvain Pion, Pedro Machado, // Julien Hazebrouck, Damien Leroy diff --git a/Circular_kernel_3/examples/Circular_kernel_3/spherical_kernel_3.cpp b/Circular_kernel_3/examples/Circular_kernel_3/spherical_kernel_3.cpp index ad3f442bb74..548d01139fe 100644 --- a/Circular_kernel_3/examples/Circular_kernel_3/spherical_kernel_3.cpp +++ b/Circular_kernel_3/examples/Circular_kernel_3/spherical_kernel_3.cpp @@ -1,25 +1,3 @@ -// Copyright (c) 2008 INRIA Sophia-Antipolis (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// Author(s) : Monique Teillaud, Sylvain Pion, Pedro Machado - -// Partially supported by the IST Programme of the EU as a -// STREP (FET Open) Project under Contract No IST-006413 -// (ACS -- Algorithms for Complex Shapes) - #include #include #include