From 0a6e126ebfa9898fcc84d97b1dd974ddbe79b879 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <Andreas.Fabri@geometryfactory.com>
Date: Tue, 6 Mar 2007 16:09:12 +0000
Subject: [PATCH] cleanup

---
 .../Stream_lines_2/stl_regular_field.cpp      | 21 +++++++++----------
 .../Stream_lines_2/stl_triangular_field.cpp   | 13 ++++++------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Stream_lines_2/examples/Stream_lines_2/stl_regular_field.cpp b/Stream_lines_2/examples/Stream_lines_2/stl_regular_field.cpp
index f0624cf6b54..9b6e79d316d 100644
--- a/Stream_lines_2/examples/Stream_lines_2/stl_regular_field.cpp
+++ b/Stream_lines_2/examples/Stream_lines_2/stl_regular_field.cpp
@@ -1,24 +1,23 @@
-#include <iostream>
-#include <fstream>
-
 #include <CGAL/Cartesian.h>
 #include <CGAL/Filtered_kernel.h>
-
 #include <CGAL/Stream_lines_2.h>
 #include <CGAL/Runge_kutta_integrator_2.h>
 #include <CGAL/Regular_grid_2.h>
 #include <CGAL/Triangular_field_2.h>
 
+#include <iostream>
+#include <fstream>
+
 typedef double coord_type;
 typedef CGAL::Cartesian<coord_type> K1;
 typedef CGAL::Filtered_kernel<K1> K;
 typedef CGAL::Regular_grid_2<K> Field;
 typedef CGAL::Runge_kutta_integrator_2<Field> Runge_kutta_integrator;
-typedef CGAL::Stream_lines_2<Field, Runge_kutta_integrator> Stl;
-typedef Stl::Point_iterator_2 Point_iterator;
-typedef Stl::Stream_line_iterator_2 Stl_iterator;
-typedef Stl::Point_2 Point_2;
-typedef Stl::Vector_2 Vector_2;
+typedef CGAL::Stream_lines_2<Field, Runge_kutta_integrator> Strl;
+typedef Strl::Point_iterator_2 Point_iterator;
+typedef Strl::Stream_line_iterator_2 Strl_iterator;
+typedef Strl::Point_2 Point_2;
+typedef Strl::Vector_2 Vector_2;
 
 int main()
 {
@@ -47,13 +46,13 @@ int main()
   std::cout << "processing...\n";
   double dSep = 3.5;
   double dRat = 1.6;
-  Stl Stream_lines(regular_grid_2, runge_kutta_integrator,dSep,dRat);
+  Strl Stream_lines(regular_grid_2, runge_kutta_integrator,dSep,dRat);
   std::cout << "placement generated\n";
 
   /*writing streamlines to streamlines_on_regular_grid_1.stl */
   std::ofstream fw("streamlines_on_regular_grid_1.stl",std::ios::out);
   fw << Stream_lines.number_of_lines() << "\n";
-  for(Stl_iterator sit = Stream_lines.begin(); sit != Stream_lines.end(); sit++)
+  for(Strl_iterator sit = Stream_lines.begin(); sit != Stream_lines.end(); sit++)
     {
       fw << "\n";
       for(Point_iterator pit = sit->first; pit != sit->second; pit++){
diff --git a/Stream_lines_2/examples/Stream_lines_2/stl_triangular_field.cpp b/Stream_lines_2/examples/Stream_lines_2/stl_triangular_field.cpp
index 2b427768aed..2452347c7f6 100644
--- a/Stream_lines_2/examples/Stream_lines_2/stl_triangular_field.cpp
+++ b/Stream_lines_2/examples/Stream_lines_2/stl_triangular_field.cpp
@@ -1,13 +1,12 @@
-#include <iostream>
-#include <fstream>
-
 #include <CGAL/Cartesian.h>
 #include <CGAL/Filtered_kernel.h>
-
 #include <CGAL/Stream_lines_2.h>
 #include <CGAL/Runge_kutta_integrator_2.h>
 #include <CGAL/Triangular_field_2.h>
 
+#include <iostream>
+#include <fstream>
+
 typedef double                                                      coord_type;
 typedef CGAL::Cartesian<coord_type>                                 K1;
 typedef CGAL::Filtered_kernel<K1> K;
@@ -15,8 +14,8 @@ typedef K::Point_2                                                  Point;
 typedef K::Vector_2                                                 Vector;
 typedef CGAL::Triangular_field_2<K>                                 Field;
 typedef CGAL::Runge_kutta_integrator_2<Field>                       Runge_kutta_integrator;
-typedef CGAL::Stream_lines_2<Field, Runge_kutta_integrator>         Stl;
-typedef Stl::Stream_line_iterator_2                                 stl_iterator;
+typedef CGAL::Stream_lines_2<Field, Runge_kutta_integrator>         Strl;
+typedef Strl::Stream_line_iterator_2                                 stl_iterator;
 
 int main()
 {
@@ -35,7 +34,7 @@ int main()
   std::cout << "processing...\n";
   double dSep = 30.0;
   double dRat = 1.6;
-  Stl Stream_lines(triangular_field, runge_kutta_integrator,dSep,dRat);
+  Strl Stream_lines(triangular_field, runge_kutta_integrator,dSep,dRat);
   std::cout << "placement generated\n";
 
   /*writing streamlines to streamlines.stl */