X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=fe860c2ee4941a2a7220dd527f87c7ad17d41ba3;hb=c8d62eca2d025e1fdce22f478f87c10f414d4b9d;hp=c6ad530e41478b8c46dd114dcf82ff446d6d5ddf;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/clef.cc b/lily/clef.cc
index c6ad530e41..fe860c2ee4 100644
--- a/lily/clef.cc
+++ b/lily/clef.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
@@ -24,11 +24,13 @@
 #include "item.hh"
 #include "stencil.hh"
 
+using std::string;
+
 MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1);
 SCM
 Clef::calc_glyph_name (SCM smob)
 {
-  Item *s = unsmob_item (smob);
+  Item *s = unsmob<Item> (smob);
   SCM glyph = s->get_property ("glyph");
 
   if (scm_is_string (glyph))
@@ -36,11 +38,11 @@ Clef::calc_glyph_name (SCM smob)
       string str = ly_scm2string (glyph);
 
       if (to_boolean (s->get_property ("non-default"))
-	  && s->break_status_dir () != RIGHT
-	  && !to_boolean (s->get_property ("full-size-change")))
-	{
-	  str += "_change";
-	}
+          && s->break_status_dir () != RIGHT
+          && !to_boolean (s->get_property ("full-size-change")))
+        {
+          str += "_change";
+        }
 
       return ly_string2scm (str);
     }
@@ -53,7 +55,7 @@ MAKE_SCHEME_CALLBACK (Clef, print, 1)
 SCM
 Clef::print (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   SCM glyph_scm = me->get_property ("glyph-name");
   if (!scm_is_string (glyph_scm))
     return SCM_EOL;
@@ -63,16 +65,17 @@ Clef::print (SCM smob)
   Stencil out = fm->find_by_name (glyph);
   if (out.is_empty ())
     me->warning (_f ("clef `%s' not found", glyph.c_str ()));
+
   return out.smobbed_copy ();
 }
 
 ADD_INTERFACE (Clef,
-	       "A clef sign.",
-
-	       /* properties */
-	       "full-size-change "
-	       "glyph "
-	       "glyph-name "
-	       "non-default "
-	       );
+               "A clef sign.",
+
+               /* properties */
+               "full-size-change "
+               "glyph "
+               "glyph-name "
+               "non-default "
+              );