*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 6e9165c34722842a0e7b9a9aa31599fe481c13fe..8ae11067514ac0462c6e5668a28d1a346fc4f82f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/include/*.hh (Module): lots of compile fixes.
+
 2005-10-14  Heikki Junes <hjunes@cc.hut.fi>
 
        * elisp/lilypond-font-lock.el, elisp/lilypond-indent.el: Avoid nil 

diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh
index 1a6cd217280f1188d9c4de62684be4dc8b5d5f44..5a9462f69ca0b98fa96c8ff34a0b3a7974e9ece2 100644 (file)
--- a/lily/include/change-iterator.hh
+++ b/lily/include/change-iterator.hh
@@ -17,6 +17,7 @@ public:
   /* constructor is public */
   virtual void process (Moment);
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Change_iterator);
 
 private:
   void error (String);

diff --git a/lily/include/chord-tremolo-iterator.hh b/lily/include/chord-tremolo-iterator.hh
index 5cc0513971522c67894586912704ba253e8f67b5..8c58fb2f9c9c1488a18486570e10dc80e72f9934 100644 (file)
--- a/lily/include/chord-tremolo-iterator.hh
+++ b/lily/include/chord-tremolo-iterator.hh
@@ -14,6 +14,7 @@
 class Chord_tremolo_iterator : public Music_iterator
 {
 public:
+  DECLARE_CLASSNAME(Chord_tremolo_iterator);
   DECLARE_SCHEME_CALLBACK (constructor, ());
   Chord_tremolo_iterator ();
   Chord_tremolo_iterator (Chord_tremolo_iterator const &);

diff --git a/lily/include/event-chord-iterator.hh b/lily/include/event-chord-iterator.hh
index c65a9dedcc9d50560b17702c00cf3321d33389ee..62c95177f95864bf94dd0402761aa345e4223906 100644 (file)
--- a/lily/include/event-chord-iterator.hh
+++ b/lily/include/event-chord-iterator.hh
@@ -20,6 +20,7 @@ class Event_chord_iterator : public Simple_music_iterator
      Find a bottom notation context to deliver events to.
   */
   virtual Context *get_bottom_context ();
+  DECLARE_CLASSNAME(Event_chord_iterator);
 
   /*
     Since Event_chord_iterator has no list-cursor internally, we

diff --git a/lily/include/folded-repeat-iterator.hh b/lily/include/folded-repeat-iterator.hh
index 12b904f7598b3093b61a703b5e17b0b3e4b15bf0..5d4250abc887ef7804d076c5afce9c4f14efc36d 100644 (file)
--- a/lily/include/folded-repeat-iterator.hh
+++ b/lily/include/folded-repeat-iterator.hh
@@ -19,6 +19,7 @@ class Folded_repeat_iterator : public Music_iterator
 {
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Folded_repeat_iterator);
 
   Folded_repeat_iterator (Folded_repeat_iterator const &src);
   Folded_repeat_iterator ();

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index cb7ace32dfd278ee297658405411ce51a3582466..81b0cdc2eeb1a6152a02407f380e9fa9761000ed 100644 (file)
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -16,6 +16,7 @@ class Grace_iterator : public Music_wrapper_iterator
 public:
   virtual void process (Moment);
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Grace_iterator);
   Moment pending_moment () const;
 };
 

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 0cfa4908ee6c4b1a3ef8f52b9ba109c396f08bbf..36b135bcb169bba798026d290607bbae0510750d 100644 (file)
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -18,6 +18,7 @@
 class Midi_item
 {
 public:
+  DECLARE_CLASSNAME(Midi_item);
   Midi_item ();
   virtual ~Midi_item ();
   virtual char const *name () const;
@@ -54,6 +55,7 @@ public:
   void set (String header_string, String data_string, String footer_string);
   virtual String to_string () const;
   virtual String data_string () const;
+  DECLARE_CLASSNAME(Midi_chunk);
 
 private:
   String data_string_;
@@ -73,6 +75,8 @@ public:
 class Midi_header : public Midi_chunk
 {
 public:
+    DECLARE_CLASSNAME(Midi_header);
+
   Midi_header (int format_i, int tracks_i, int clocks_per_4_i);
 };
 
@@ -84,6 +88,7 @@ class Midi_instrument : public Midi_item
 public:
   Midi_instrument (Audio_instrument *);
 
+  DECLARE_CLASSNAME(Midi_instrument);
   virtual String to_string () const;
 
   Audio_instrument *audio_;
@@ -93,6 +98,7 @@ class Midi_key : public Midi_item
 {
 public:
   Midi_key (Audio_key *);
+  DECLARE_CLASSNAME(Midi_key);
 
   virtual String to_string () const;
 
@@ -103,6 +109,7 @@ class Midi_time_signature : public Midi_item
 {
 public:
   Midi_time_signature (Audio_time_signature *);
+  DECLARE_CLASSNAME(Midi_time_signature);
 
   virtual String to_string () const;
 
@@ -117,6 +124,7 @@ class Midi_note : public Midi_item
 {
 public:
   Midi_note (Audio_note *);
+  DECLARE_CLASSNAME(Midi_note);
 
   Moment get_length () const;
   int get_pitch () const;
@@ -136,6 +144,7 @@ class Midi_note_off : public Midi_note
 {
 public:
   Midi_note_off (Midi_note *);
+  DECLARE_CLASSNAME(Midi_note_off);
 
   virtual String to_string () const;
 
@@ -151,6 +160,7 @@ public:
       TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
       MARKER, CUE_POINT
     };
+  DECLARE_CLASSNAME(Midi_text);
 
   Midi_text (Audio_text *);
 
@@ -163,6 +173,7 @@ class Midi_dynamic : public Midi_item
 {
 public:
   Midi_dynamic (Audio_dynamic *);
+  DECLARE_CLASSNAME(Midi_dynamic);
 
   virtual String to_string () const;
 
@@ -173,6 +184,7 @@ class Midi_piano_pedal : public Midi_item
 {
 public:
   Midi_piano_pedal (Audio_piano_pedal *);
+  DECLARE_CLASSNAME(Midi_piano_pedal);
 
   virtual String to_string () const;
 
@@ -183,6 +195,7 @@ class Midi_tempo : public Midi_item
 {
 public:
   Midi_tempo (Audio_tempo *);
+  DECLARE_CLASSNAME(Midi_tempo);
 
   virtual String to_string () const;
 
@@ -193,6 +206,7 @@ class Midi_track : public Midi_chunk
 {
 public:
   int number_;
+  DECLARE_CLASSNAME(Midi_track);
 
   /*
     Compensate for starting grace notes.

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 2b1f74ed5377f172a67f68283e7f21a14f228917..0f4dbd3fc9ec34f2ea972dd026f9587bc8f7adbe 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -53,6 +53,7 @@ protected:
   Moment music_length_;
   Moment start_mom_;
 
+  DECLARE_CLASSNAME(Music_iterator);
   DECLARE_SMOBS (Music_iterator, dummy);
   Music_iterator (Music_iterator const &);
 

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index 15f930000bde1264909ff544666274499cc005ce..7a9abf38abf4e45a11cbf5593466d5510eb21586 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -13,11 +13,12 @@
 #include "lily-proto.hh"
 #include "protected-scm.hh"
 #include "smobs.hh"
+#include "virtual-methods.hh"
 
 class Music_output
 {
   DECLARE_SMOBS (Music_output, foo);
-
+  DECLARE_CLASSNAME(Music_output);
 protected:
   Music_output ();
 

diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index 660ab140ab51e1714457784315e8aba135ed2843..7aa381bec791a1b9a63266458f5b12d23005996b 100644 (file)
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -22,6 +22,7 @@ class Music_wrapper_iterator : public Music_iterator
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
   Music_wrapper_iterator ();
+  DECLARE_CLASSNAME(Music_wrapper_iterator);
 
   virtual void derived_substitute (Context *f, Context *t);
   virtual void derived_mark () const;

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index a8191a361f51307a28d213f36ecf5040f9d00cad..9a1439087fdb0b0ef698e69db4f62c0f28b17452 100644 (file)
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -23,6 +23,8 @@ class Paper_score : public Music_output
 public:
   Paper_score (Output_def *);
 
+  DECLARE_CLASSNAME(Paper_score);
+
   Output_def *layout () const;
   System *root_system () const;
 

diff --git a/lily/include/percent-repeat-iterator.hh b/lily/include/percent-repeat-iterator.hh
index 733ab0c537ef216bdef0097386fb6a813e40bb94..e9dce945ee241dde493f366edc6e92d0aca9f285 100644 (file)
--- a/lily/include/percent-repeat-iterator.hh
+++ b/lily/include/percent-repeat-iterator.hh
@@ -14,6 +14,7 @@
 class Percent_repeat_iterator : public Music_iterator
 {
 public:
+  DECLARE_CLASSNAME(Percent_repeat_iterator);
   DECLARE_SCHEME_CALLBACK (constructor, ());
   Percent_repeat_iterator ();
 protected:

diff --git a/lily/include/performance.hh b/lily/include/performance.hh
index 2fad187dcbebd2335a58d674b94a888c3b5d61d0..49951bc2177a93edbf1787de0bd69bf2c26ba606 100644 (file)
--- a/lily/include/performance.hh
+++ b/lily/include/performance.hh
@@ -17,6 +17,7 @@ class Performance : public Music_output
 public:
   Performance ();
   ~Performance ();
+  DECLARE_CLASSNAME(Performance);
 
   void add_element (Audio_element *p);
 

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index df24350c05b7e360c255e4f09014ed7805d8ce51..8d096f2fc0e310bf849a4136b163f890ef899cbc 100644 (file)
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -19,6 +19,7 @@ class Property_iterator : public Simple_music_iterator
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
   DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+  DECLARE_CLASSNAME(Property_iterator);
 
 protected:
   virtual void do_quit ();
@@ -32,6 +33,7 @@ class Property_unset_iterator : public Simple_music_iterator
 {
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Property_unset_iterator);
 protected:
   virtual void process (Moment);
 };
@@ -41,6 +43,7 @@ class Push_property_iterator : public Simple_music_iterator
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
   DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+  DECLARE_CLASSNAME(Push_property_iterator);
 protected:
   virtual void process (Moment);
   virtual void do_quit ();
@@ -50,6 +53,7 @@ class Pop_property_iterator : public Simple_music_iterator
 {
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Pop_property_iterator);
 protected:
   virtual void process (Moment);
 };

diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index c3e5c277a7a781e5a6cdf2a5a67b2643d7232a62..2868816eff959d78878f5a5dd64fe4e1fafb4a46 100644 (file)
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -19,6 +19,7 @@ class Sequential_iterator : public Music_iterator
 {
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Sequential_iterator);
   Sequential_iterator ();
   Sequential_iterator (Sequential_iterator const &);
   virtual void derived_substitute (Context *f, Context *t);
@@ -34,9 +35,11 @@ protected:
   virtual void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
   virtual bool run_always () const;
+  
 protected:
   Music_iterator *iter_;
-  virtual SCM get_music_list ()const;
+  
+  virtual SCM get_music_list () const;
   virtual void next_element (bool side_effect);
 
   Grace_fixup *get_grace_fixup () const;

diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh
index f43c5a6a59868ef30be2d7f3f8c37fc269171fb5..18232cd51269b819fdcd0a6eeef7f749752a2c94 100644 (file)
--- a/lily/include/sequential-music-iterator.hh
+++ b/lily/include/sequential-music-iterator.hh
@@ -18,6 +18,7 @@ class Sequential_music_iterator : public Sequential_iterator
 {
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Sequential_music_iterator);
 private:
   virtual SCM get_music_list ()const;
 };

diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh
index 29710cfa860dde094fa1574acaa3c7495180dee2..f1958b3762a81609b260c91cb31ac87cb87b28ec 100644 (file)
--- a/lily/include/simple-music-iterator.hh
+++ b/lily/include/simple-music-iterator.hh
@@ -18,6 +18,7 @@
 class Simple_music_iterator : public Music_iterator
 {
 protected:
+  DECLARE_CLASSNAME(Simple_music_iterator);
 
   Moment last_processed_mom_;
 public:

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 7e8118bc52319519000083d43bf5b7f76cb9b25d..c753445d0a17d9c7153b5d8c9fbe25a650648d42 100644 (file)
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -19,6 +19,7 @@ public:
   virtual void derived_substitute (Context *f, Context *t);
   virtual void derived_mark () const;
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Simultaneous_music_iterator);
 
   /// make a new context for every child.
   bool create_separate_contexts_;

diff --git a/lily/include/time-scaled-music-iterator.hh b/lily/include/time-scaled-music-iterator.hh
index 5d0224861d32b8449f085857dae94f74a6a09872..d64ac1f79bef74ef0a51cbc812347a8b72ff79cd 100644 (file)
--- a/lily/include/time-scaled-music-iterator.hh
+++ b/lily/include/time-scaled-music-iterator.hh
@@ -16,6 +16,7 @@ class Time_scaled_music_iterator : public Music_wrapper_iterator
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
   /* construction */
+  DECLARE_CLASSNAME(Time_scaled_music_iterator);
 protected:
   virtual void process (Moment);
 };

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index ad1001cbd714ff969753adb8358533dda343ad0e..5b7af3c5a2a8098d142bb59ff15c14fab346e0c9 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -473,5 +473,5 @@ Midi_track::data_string () const
 char const *
 Midi_item::name () const
 {
-  return this->class_name ();
+   return this->class_name ();
 }

diff --git a/lily/output-property-music-iterator.cc b/lily/output-property-music-iterator.cc
index 462d7c6714dd59254777a5cf1cc9f924e8728271..01c47ec3a6437020d8eaf4a269e1389f92017020 100644 (file)
--- a/lily/output-property-music-iterator.cc
+++ b/lily/output-property-music-iterator.cc
@@ -27,7 +27,7 @@ Output_property_music_iterator::process (Moment m)
       bool accepted = try_music (get_music ());
       if (!accepted)
        get_music ()->origin ()->warning (_f ("junking event: `%s'",
-                                         get_music (->class_name ())));
+                                             get_music ()->class_name ()));
     }
   Simple_music_iterator::process (m);
 }

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 99be33adeded7501cc2a6832dd17f805370a6501..4cd47232a0f6a7fc05acb504c2557ffa652a28c9 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -57,10 +57,7 @@ Paper_book::print_smob (SCM smob, SCM port, scm_print_state*)
 {
   Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob);
 
-  scm_puts ("#<", port);
-  scm_puts (b->class_name (), port);
-  scm_puts (" ", port);
-  scm_puts (">", port);
+  scm_puts ("#<Paper_book>", port);
   return 1;
 }