From f1410d4d9da474db6f54b9d5241308b3ae5554e5 Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Sun, 19 Mar 2006 22:43:06 +0000
Subject: [PATCH] Some CGAL_USE_QT versus <CGAL/basic.h> ordering issues
 spotted by the following (quick and very dirty) perl regexp : perl
 -0777pi.bak -e 'print m!CGAL_USE_QT(.|[\r\n])*CGAL/basic!g;' */demo/*/*.C

---
 Min_circle_2/demo/Min_circle_2/min_circle_2.C              | 1 -
 Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.C           | 1 -
 .../demo/Min_quadrilateral_2/min_quadrilateral_2.C         | 4 ----
 Minkowski_sum_2/demo/Minkowski_sum_2/Minkowski_demo.C      | 5 +++--
 Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C               | 2 ++
 Partition_2/demo/Partition_2/partition_2.C                 | 5 +----
 Stream_lines_2/demo/Stream_lines_2/streamlines.C           | 7 ++++---
 Triangulation_2/demo/Triangulation_2/constrained.C         | 3 ---
 8 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/Min_circle_2/demo/Min_circle_2/min_circle_2.C b/Min_circle_2/demo/Min_circle_2/min_circle_2.C
index de3ba8de234..2af30c8f994 100644
--- a/Min_circle_2/demo/Min_circle_2/min_circle_2.C
+++ b/Min_circle_2/demo/Min_circle_2/min_circle_2.C
@@ -33,7 +33,6 @@ int main(int, char*){
 #include <set>
 #include <string>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Min_circle_2.h>
 #include <CGAL/Min_circle_2_traits_2.h>
diff --git a/Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.C b/Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.C
index f35bc92d777..024df48a292 100644
--- a/Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.C
+++ b/Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.C
@@ -40,7 +40,6 @@ int main(int, char*)
 #include <set>
 #include <string>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Min_ellipse_2.h>
 #include <CGAL/Min_ellipse_2_traits_2.h>
diff --git a/Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.C b/Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.C
index 8dde5dd7dc7..a3bcd7fef92 100644
--- a/Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.C
+++ b/Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.C
@@ -23,13 +23,10 @@
 #ifndef CGAL_USE_QT
 #include <iostream>
 
-
 int main(int, char*)
 {
-
   std::cout << "Sorry, this demo needs QT...";
   std::cout << std::endl;
-
   return 0;
 }
 
@@ -41,7 +38,6 @@ int main(int, char*)
 #include <string>
 
 //CGAL
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/point_generators_2.h>
 #include <CGAL/Polygon_2.h>
diff --git a/Minkowski_sum_2/demo/Minkowski_sum_2/Minkowski_demo.C b/Minkowski_sum_2/demo/Minkowski_sum_2/Minkowski_demo.C
index cb06bb2430e..c05b3390d42 100644
--- a/Minkowski_sum_2/demo/Minkowski_sum_2/Minkowski_demo.C
+++ b/Minkowski_sum_2/demo/Minkowski_sum_2/Minkowski_demo.C
@@ -1,6 +1,9 @@
 /*
  * A simple demo that computes the Minkowski sum of two polygons.
  */
+
+#include <CGAL/basic.h>
+
 #ifndef CGAL_USE_QT
 
 #include <iostream>
@@ -17,8 +20,6 @@ int main ()
 //#define RWRW_STATS
 #define USE_LAZY_KERNEL
 
-#include <CGAL/basic.h>
-
 #ifdef USE_LAZY_KERNEL
 
 /*
diff --git a/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C b/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C
index f0506b5d6ab..9d1a7308c6a 100644
--- a/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C
+++ b/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C
@@ -18,6 +18,8 @@
 // Author(s)     : Michael Seel       <seel@mpi-sb.mpg.de>
 //                 Peter Hachenberger <hachenberger@mpi-sb.mpg.de>
 
+#include <CGAL/basic.h>
+
 #ifndef CGAL_USE_QT
 #include <iostream>
 int main(int, char*){
diff --git a/Partition_2/demo/Partition_2/partition_2.C b/Partition_2/demo/Partition_2/partition_2.C
index 18c907be4a9..0cec1bc60c6 100644
--- a/Partition_2/demo/Partition_2/partition_2.C
+++ b/Partition_2/demo/Partition_2/partition_2.C
@@ -23,18 +23,15 @@
 #ifndef CGAL_USE_QT
 #include <iostream>
 
-
 int main(int, char*)
 {
-
   std::cout << "Sorry, this demo needs QT...";
   std::cout << std::endl;
-
   return 0;
 }
 
 #else
-#include <CGAL/basic.h>
+
 #include <qplatinumstyle.h>
 #include <qapplication.h>
 #include <qmainwindow.h>
diff --git a/Stream_lines_2/demo/Stream_lines_2/streamlines.C b/Stream_lines_2/demo/Stream_lines_2/streamlines.C
index 1956d29ad79..fe4a12d68d4 100644
--- a/Stream_lines_2/demo/Stream_lines_2/streamlines.C
+++ b/Stream_lines_2/demo/Stream_lines_2/streamlines.C
@@ -1,18 +1,19 @@
 // if QT is not installed, a message will be issued in runtime.
+
+#include <CGAL/basic.h>
 #include <iostream>
+
 #ifndef CGAL_USE_QT
 
 int main(int, char*)
 {
-
   std::cout << "Sorry, this demo needs QT...";
   std::cout << std::endl;
-
   return 0;
 }
 
 #else
-#include <CGAL/basic.h>
+
 #include <qapplication.h>
 #include <qfont.h>
 #include <qpushbutton.h>
diff --git a/Triangulation_2/demo/Triangulation_2/constrained.C b/Triangulation_2/demo/Triangulation_2/constrained.C
index 18dd7e50194..174fd20fad6 100644
--- a/Triangulation_2/demo/Triangulation_2/constrained.C
+++ b/Triangulation_2/demo/Triangulation_2/constrained.C
@@ -25,10 +25,8 @@
 
 int main(int, char*)
 {
-
   std::cout << "Sorry, this demo needs QT...";
   std::cout << std::endl;
-
   return 0;
 }
 
@@ -39,7 +37,6 @@ int main(int, char*)
 #include <set>
 #include <string>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Point_2.h>
 #include <CGAL/Triangulation_euclidean_traits_2.h>