* The grand 2005-2006 replace.

[lilypond.git] / lily / object-key-dumper.cc

diff --git a/lily/object-key-dumper.cc b/lily/object-key-dumper.cc
index 4a29c9c7aec8ccf3b72e387cb47a40295e13c449..8b51037e4499dac2fc562fa67b6e2146ef4f4268 100644 (file)
--- a/lily/object-key-dumper.cc
+++ b/lily/object-key-dumper.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "object-key-dumper.hh"
@@ -20,9 +20,7 @@ Object_key_dumper::mark_smob (SCM smob)
   for (Key_to_key_map::const_iterator i (dumper->serialized_keys_.begin ());
        i != dumper->serialized_keys_.end ();
        i++)
-    {
-      scm_gc_mark ((*i).first->self_scm ());
-    }
+    scm_gc_mark ((*i).first->self_scm ());
   return SCM_EOL;
 }
 
@@ -57,9 +55,7 @@ Object_key_dumper::serialize_key (Object_key const *key)
   for (SCM s = skey; scm_is_pair (s); s = scm_cdr (s))
     {
       if (Object_key const *sub_key = unsmob_key (scm_car (s)))
-       {
-         scm_set_car_x (s, dump_key (sub_key));
-       }
+       scm_set_car_x (s, dump_key (sub_key));
       else if (Moment *mom = unsmob_moment (scm_car (s)))
        {
          scm_set_car_x (s,
@@ -85,13 +81,9 @@ SCM
 Object_key_dumper::dump_key (Object_key const *key)
 {
   if (key_serial_numbers_.find (key) != key_serial_numbers_.end ())
-    {
-      return key_serial (key_serial_numbers_[key]);
-    }
+    return key_serial (key_serial_numbers_[key]);
   else if (Object_key const *serialized = serialized_keys_[key])
-    {
-      return key_serial (key_serial_numbers_[ serialized_keys_ [serialized] ]);
-    }
+    return key_serial (key_serial_numbers_[ serialized_keys_ [serialized] ]);
 
   return serialize_key (key);
 }