Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / ledger-line-spanner.cc

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 900187b333d68309210fd595b17742db56808e71..4849cdfee5d31a84bc49f6260239d0f24b2e4137 100644 (file)
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -18,7 +18,6 @@
 */
 
 #include <map>
-using namespace std;
 
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
@@ -28,11 +27,13 @@ using namespace std;
 #include "pointer-group-interface.hh"
 #include "paper-column.hh"
 
+using std::map;
+using std::vector;
+
 struct Ledger_line_spanner
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
-  DECLARE_GROB_INTERFACE ();
 };
 
 static void
@@ -66,7 +67,7 @@ MAKE_SCHEME_CALLBACK (Ledger_line_spanner, set_spacing_rods, 1);
 SCM
 Ledger_line_spanner::set_spacing_rods (SCM smob)
 {
-  Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (smob));
+  Spanner *me = unsmob<Spanner> (smob);
 
   // find size of note heads.
   Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
@@ -130,7 +131,7 @@ Ledger_line_spanner::set_spacing_rods (SCM smob)
         continue;
 
       current_extents[vdir].unite (head_extent);
-      current_head_width = max (current_head_width, head_extent.length ());
+      current_head_width = std::max (current_head_width, head_extent.length ());
     }
 
   if (previous_column && current_column)
@@ -164,7 +165,7 @@ MAKE_SCHEME_CALLBACK (Ledger_line_spanner, print, 1);
 SCM
 Ledger_line_spanner::print (SCM smob)
 {
-  Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (smob));
+  Spanner *me = unsmob<Spanner> (smob);
 
   extract_grob_set (me, "note-heads", heads);
 
@@ -193,7 +194,7 @@ Ledger_line_spanner::print (SCM smob)
       Axis a = Axis (i);
       common[a] = common_refpoint_of_array (heads, me, a);
       for (vsize i = heads.size (); i--;)
-        if (Grob *g = Grob::unsmob (me->get_object ("accidental-grob")))
+        if (Grob *g = unsmob<Grob> (me->get_object ("accidental-grob")))
           common[a] = common[a]->common_refpoint (g, a);
     }
 
@@ -215,7 +216,7 @@ Ledger_line_spanner::print (SCM smob)
           reqs[rank][vdir].ledger_extent_.unite (ledger_extent);
           reqs[rank][vdir].head_extent_.unite (head_extent);
           reqs[rank][vdir].position_
-            = vdir * max (vdir * reqs[rank][vdir].position_, vdir * pos);
+            = vdir * std::max (vdir * reqs[rank][vdir].position_, vdir * pos);
         }
     }
 
@@ -250,7 +251,7 @@ Ledger_line_spanner::print (SCM smob)
                                                   - sign (i->second[d].position_)));
                   Real limit = (center + (both ? which * gap / 2 : 0));
                   lr.ledger_extent_.at (-which)
-                    = which * max (which * lr.ledger_extent_[-which], which * limit);
+                    = which * std::max (which * lr.ledger_extent_[-which], which * limit);
                 }
             }
         }
@@ -287,7 +288,7 @@ Ledger_line_spanner::print (SCM smob)
               Interval x_extent = ledger_size;
 
               if (i == 0)
-                if (Grob *g = Grob::unsmob (h->get_object ("accidental-grob")))
+                if (Grob *g = unsmob<Grob> (h->get_object ("accidental-grob")))
                   {
                     Interval accidental_size = g->extent (common[X_AXIS], X_AXIS);
                     Real d
@@ -295,7 +296,7 @@ Ledger_line_spanner::print (SCM smob)
                                                               head_size[LEFT]),
                                             0.0);
 
-                    Real left_shorten = max (-ledger_size[LEFT] + d, 0.0);
+                    Real left_shorten = std::max (-ledger_size[LEFT] + d, 0.0);
 
                     x_extent[LEFT] += left_shorten;
                     /*
@@ -339,7 +340,6 @@ ADD_INTERFACE (Ledger_line_spanner,
 
 struct Ledgered_interface
 {
-  DECLARE_GROB_INTERFACE ();
 };
 
 ADD_INTERFACE (Ledgered_interface,