release: 0.0.64

[lilypond.git] / lily / complex-walker.cc

diff --git a/lily/complex-walker.cc b/lily/complex-walker.cc
index 09773b1503099016efc92c11a3f3a096e9a922bd..1e1ac452d78d07feb5e2cb0c2cd48ec968e41bfc 100644 (file)
--- a/lily/complex-walker.cc
+++ b/lily/complex-walker.cc
@@ -6,17 +6,12 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
-#include "musical-request.hh"
 #include "staff-column.hh"
 #include "voice.hh"
 #include "p-score.hh"
 #include "complex-staff.hh"
 #include "debug.hh"
-#include "voice-group-regs.hh"
-#include "voice-regs.hh"
 #include "complex-walker.hh"
-//#include "misc.hh"
-#include "command-request.hh"
 #include "walk-regs.hh"
 
 void
@@ -37,16 +32,13 @@ Complex_walker::do_announces()
     walk_regs_p_->do_announces();
 }
 
-bool
-Complex_walker::try_command_request(Command_req *req_l)
-{
-    return walk_regs_p_->try_request(req_l);
-}
 
 void
 Complex_walker::try_request(Request*req)
 {
-    walk_regs_p_->try_request(req);
+    bool b =walk_regs_p_->try_request(req);
+    if (!b)
+       req->warning("junking request: "  + String(req->name()));
 }
 
 void
@@ -76,7 +68,7 @@ Complex_walker::regs_process_requests()
 }
 
 void
-Complex_walker::typeset_element(Staff_elem *elem_p)
+Complex_walker::typeset_element(Score_elem *elem_p)
 {
     if (!elem_p)
        return;