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

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 47e2d71f11d00b0c2c978807c61af21dead1582b..6406d1318fe4af3751594ed23d104c78b69901b6 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -32,6 +32,10 @@
 #include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
+using std::set;
+
 class Rest_collision_engraver : public Engraver
 {
 protected:
@@ -57,12 +61,12 @@ Rest_collision_engraver::process_acknowledged ()
 
   for (SCM s = get_property ("busyGrobs"); scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob *g = Grob::unsmob (scm_cdar (s));
-      Moment *m = Moment::unsmob (scm_caar (s));
+      Grob *g = unsmob<Grob> (scm_cdar (s));
+      Moment *m = unsmob<Moment> (scm_caar (s));
       if (!g || !m)
         continue;
 
-      if (Rhythmic_head::has_interface (g) && (*m) > now)
+      if (has_interface<Rhythmic_head> (g) && (*m) > now)
         {
           Grob *column = g->get_parent (X_AXIS);
           if (!column)
@@ -70,7 +74,7 @@ Rest_collision_engraver::process_acknowledged ()
 
           // Only include rests that start now. Include notes that started any time.
           Paper_column *paper_column = dynamic_cast<Item *> (column)->get_column ();
-          if (!Rest::has_interface (g) || !paper_column || Paper_column::when_mom (paper_column) == now)
+          if (!has_interface<Rest> (g) || !paper_column || Paper_column::when_mom (paper_column) == now)
             {
               columns.insert (column);
               rest_count += Note_column::has_rests (column);
@@ -92,8 +96,6 @@ Rest_collision_engraver::stop_translation_timestep ()
   rest_collision_ = 0;
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Rest_collision_engraver,
                 /* doc */
                 "Handle collisions of rests.",