X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-check-iterator.cc;h=2a3efe757c74fee0746b691a595f366e24e19d87;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=1fbd7905cccf00e9781dfbe702c4c4a74882c763;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index 1fbd7905cc..2a3efe757c 100644
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2001--2010  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2001--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
@@ -51,38 +51,38 @@ Bar_check_iterator::process (Moment m)
 
       SCM check = tr->get_property ("ignoreBarChecks");
       if (to_boolean (check))
-	return;
+        return;
 
       SCM mp = tr->get_property ("measurePosition");
       SCM sync = tr->get_property ("barCheckSynchronize");
 
-      Moment *where = unsmob_moment (mp);
+      Moment *where = Moment::unsmob (mp);
       if (!where)
-	return;
+        return;
 
       if (where->main_part_)
-	{
-	  bool warn = true;
-	  if (to_boolean (sync))
-	    {
-	      SCM mp;
-	      tr = tr->where_defined (ly_symbol2scm ("measurePosition"), &mp);
-	      Moment zero;
-	      tr->set_property ("measurePosition", zero.smobbed_copy ());
-	    }
-	  else
-	    {
-	      SCM lf = tr->get_property ("barCheckLastFail");
-	      if (unsmob_moment (lf)
-		  && *unsmob_moment (lf) == *where)
-		warn = false;
-	      else
-		tr->set_property ("barCheckLastFail", mp);
-	    }
+        {
+          bool warn = true;
+          if (to_boolean (sync))
+            {
+              SCM mp;
+              tr = tr->where_defined (ly_symbol2scm ("measurePosition"), &mp);
+              Moment zero;
+              tr->set_property ("measurePosition", zero.smobbed_copy ());
+            }
+          else
+            {
+              SCM lf = tr->get_property ("barCheckLastFail");
+              if (Moment::is_smob (lf)
+                  && *Moment::unsmob (lf) == *where)
+                warn = false;
+              else
+                tr->set_property ("barCheckLastFail", mp);
+            }
 
-	  if (warn)
-	    get_music ()->origin ()->warning (_f ("barcheck failed at: %s",
-						  where->to_string ()));
-	}
+          if (warn)
+            get_music ()->origin ()->warning (_f ("barcheck failed at: %s",
+                                                  where->to_string ()));
+        }
     }
 }