release: 0.0.44

[lilypond.git] / lily / walk-regs.cc

diff --git a/lily/walk-regs.cc b/lily/walk-regs.cc
index ab242065d54a45426b32e5ba94ce4ebccb9f48c3..b258bd559d23b42ebcabe28b4eb30b1d68da02da 100644 (file)
--- a/lily/walk-regs.cc
+++ b/lily/walk-regs.cc
@@ -20,7 +20,7 @@
 #include "staff-column.hh"
 #include "voice-group-regs.hh"
 #include "voice-regs.hh"
-#include "commandrequest.hh"
+#include "command-request.hh"
 #include "score-walker.hh"
 
 Walker_registers::Walker_registers(Complex_walker *w)
@@ -153,7 +153,7 @@ Walker_registers::try_request(Request * r)
            change_group(cr_l->groupchange(), 0, 0);
        } else 
            warning("junking request: "  + String(r->name()),
-                   r->defined_ch_c_l_);
+                   r->defined_ch_C_);
     }
     return b;
 }
@@ -166,8 +166,8 @@ Walker_registers::get_staff_info() return inf;
        inf.break_allowed_b_ = walk_l_->score_walk_l_->break_allowed_b();
     inf.c0_position_i_ = &walk_l_->c0_position_i_;
     inf.walk_l_ = walk_l_;
-    inf.time_c_l_ = &walk_l_->time_;
-    inf.rhythmic_c_l_ = walk_l_->default_grouping;
+    inf.time_C_ = &walk_l_->time_;
+    inf.rhythmic_C_ = walk_l_->default_grouping;
 }
 
 Paper_def*