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

[lilypond.git] / lily / span-bar-engraver.cc

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index a1420d532bdc00d963b54087b8e8444d07758d3b..eb0ff52f7fb60db5c760bfd855962251467c5779 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,6 +20,11 @@
 #include "item.hh"
 #include "engraver.hh"
 #include "pointer-group-interface.hh"
+#include "lily-imports.hh"
+
+#include "translator.icc"
+
+using std::vector;
 
 /**
 
@@ -85,14 +90,12 @@ Span_bar_engraver::stop_translation_timestep ()
       SCM vis = bars_[0]->get_property ("break-visibility");
       if (ly_is_equal (spanbar_->get_property ("break-visibility"), vis))
         spanbar_->set_property ("break-visibility", vis);
-      scm_call_1 (ly_lily_module_constant ("span-bar::notify-grobs-of-my-existence"), spanbar_->self_scm ());
+      Lily::span_bar_notify_grobs_of_my_existence (spanbar_->self_scm ());
       spanbar_ = 0;
     }
   bars_.resize (0);
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
 ADD_TRANSLATOR (Span_bar_engraver,
                 /* doc */