release: 0.0.44

[lilypond.git] / lily / local-key-reg.cc

diff --git a/lily/local-key-reg.cc b/lily/local-key-reg.cc
index bf7eb9c352e25ef0ef6c1cc42bb72ca63e70ae16..0ce36e955c1d4d9cd6039bec008880dc32860374 100644 (file)
--- a/lily/local-key-reg.cc
+++ b/lily/local-key-reg.cc
@@ -16,7 +16,7 @@
 Local_key_register::Local_key_register()
 {
     key_item_p_ = 0;
-    key_c_l_ = 0;
+    key_C_ = 0;
 }
 
 void
@@ -51,19 +51,19 @@ Local_key_register::acknowledge_element(Staff_elem_info info)
     } else if (info.elem_p_->name()==Key_item::static_name()) { 
        Key_register * key_reg_l =
            (Key_register*)info.origin_reg_l_arr_[0];
-       key_c_l_ = &key_reg_l->key_;
-       local_key_.reset(*key_c_l_);
+       key_C_ = &key_reg_l->key_;
+       local_key_.reset(*key_C_);
     }  
 }
 
 void
 Local_key_register::process_requests()
 {
-    Time_description const * time_c_l_ = get_staff_info().time_c_l_;
-    if (! time_c_l_->whole_in_measure_){
-       if (key_c_l_)  
-           local_key_.reset(*key_c_l_);
-       else if( time_c_l_->when_ >Moment(0))
+    Time_description const * time_C_ = get_staff_info().time_C_;
+    if (! time_C_->whole_in_measure_){
+       if (key_C_)  
+           local_key_.reset(*key_C_);
+       else if( time_C_->when_ >Moment(0))
            warning ("Help me! can't figure  current key", 0);
     }
 }