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

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 86de7a9c3d7f2588880a64a0d1862ebf4a81f3ad..1abd13646c26f4e36902befe001dd5ed0bdd65cf 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -20,7 +20,6 @@
 #include "rest-collision.hh"
 
 #include <cmath>                // ceil.
-using namespace std;
 
 #include "directional-element-interface.hh"
 #include "duration.hh"
@@ -36,6 +35,9 @@ using namespace std;
 #include "grob.hh"
 #include "unpure-pure-container.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
+
+using std::vector;
 
 MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1, "");
 SCM
@@ -51,7 +53,7 @@ Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
   if (scm_is_number (offset))
     rest_grob->translate_axis (scm_to_double (offset), Y_AXIS);
 
-  if (Note_column::has_interface (parent) && Note_column::has_rests (parent))
+  if (has_interface<Note_column> (parent) && Note_column::has_rests (parent))
     {
       Grob *collision = unsmob<Grob> (parent->get_object ("rest-collision"));
 
@@ -75,7 +77,7 @@ Rest_collision::add_column (Grob *me, Grob *p)
       chain_offset_callback (rest,
                              Unpure_pure_container::make_smob
                              (Rest_collision::force_shift_callback_rest_proc,
-                              ly_lily_module_constant ("pure-chain-offset-callback")),
+                              Lily::pure_chain_offset_callback),
                              Y_AXIS);
     }
 }
@@ -108,7 +110,7 @@ Rest_collision::calc_positioning_done (SCM smob)
   for (vsize i = 0; i < elts.size (); i++)
     {
       Grob *e = elts[i];
-      if (Note_column::has_interface (e))
+      if (has_interface<Note_column> (e))
         {
           if (unsmob<Grob> (e->get_object ("rest")))
             rests.push_back (e);
@@ -253,7 +255,7 @@ Rest_collision::calc_positioning_done (SCM smob)
                 notedim.unite (notes[i]->extent (common, Y_AXIS));
             }
 
-          Real y = dir * max (0.0,
+          Real y = dir * std::max (0.0,
                               -dir * restdim[-dir] + dir * notedim[dir] + minimum_dist);
 
           // move discretely by half spaces.