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

[lilypond.git] / lily / note-heads-engraver.cc

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 2e584539d6de149e951a56e6c70da48dd923f17e..9c12fc78b26a53a208454254141ba4218c1093f7 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 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,7 +20,6 @@
 #include "engraver.hh"
 
 #include <cctype>
-using namespace std;
 
 #include "duration.hh"
 #include "item.hh"
@@ -33,6 +32,8 @@ using namespace std;
 
 #include "translator.icc"
 
+using std::vector;
+
 class Note_heads_engraver : public Engraver
 {
   vector<Stream_event *> note_evs_;
@@ -68,7 +69,7 @@ Note_heads_engraver::process_music ()
       Stream_event *ev = note_evs_[i];
       Item *note = make_item ("NoteHead", ev->self_scm ());
 
-      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
+      Pitch *pit = unsmob<Pitch> (ev->get_property ("pitch"));
 
 #if 0 /* TODO: should have a mechanism to switch off these warnings. */
 
@@ -99,9 +100,9 @@ Note_heads_engraver::process_music ()
       if (scm_is_vector (shape_vector))
         {
           SCM scm_tonic = get_property ("tonic");
-          Pitch tonic (0, 0, 0);
-          if (unsmob_pitch (scm_tonic))
-            tonic = *unsmob_pitch (scm_tonic);
+          Pitch tonic;
+          if (unsmob<Pitch> (scm_tonic))
+            tonic = *unsmob<Pitch> (scm_tonic);
 
           unsigned int delta = (pit->get_notename () - tonic.get_notename () + 7) % 7;