X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=f351d1ba362f6b8126a18311487d9fc2d1609c85;hb=78fab0cd2b9f3f568e9b97b313e33f28d7077223;hp=fc24bc184cfd84d25f6380667c531812335e2ee9;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index fc24bc184c..f351d1ba36 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -10,7 +10,7 @@
 #include "group-interface.hh"
 #include "misc.hh"
 #include "paper-score.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "grob.hh"
 #include "spanner.hh"
 #include "item.hh"
@@ -69,7 +69,7 @@ void
 Grob::internal_set_property (SCM s, SCM v)
 {
   /* Perhaps we simply do the assq_set, but what the heck. */
-  if (!live ())
+  if (!is_live ())
     return;
 
   if (internal_type_checking_global_b)
@@ -92,7 +92,7 @@ Grob::internal_get_property (SCM sym) const
 
   s = scm_sloppy_assq (sym, immutable_property_alist_);
   
-  if (internal_type_checking_global_b && ly_pair_p (s))
+  if (internal_type_checking_global_b && ly_c_pair_p (s))
     {
       if (!type_check_assignment (sym, ly_cdr (s),
 				  ly_symbol2scm ("backend-type?")))
@@ -113,7 +113,7 @@ Grob::substitute_mutable_properties (SCM crit, SCM orig)
 
 
 bool
-Grob::live () const
+Grob::is_live () const
 {
   return immutable_property_alist_ != SCM_EOL;
 }