Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond into tmp

[lilypond.git] / lily / include / stream-event.hh

diff --git a/lily/include/stream-event.hh b/lily/include/stream-event.hh
index 991e6723090a26b9f040870270c5fe9f07e8c838..ebdc17925cc576dcce8f1e22deadc4ec6afd5e1e 100644 (file)
--- a/lily/include/stream-event.hh
+++ b/lily/include/stream-event.hh
@@ -18,24 +18,24 @@ class Stream_event : public Prob
 public:
   Stream_event ();
   VIRTUAL_COPY_CONSTRUCTOR (Stream_event, Stream_event);
-  // todo: remove unneeded constructors
-  Stream_event (SCM event_class, SCM mutable_props);
-  Stream_event (SCM property_alist);
+
+  Stream_event (SCM event_class, SCM mutable_props=SCM_EOL);
   Stream_event (SCM class_name, Input *);
-  Stream_event (Stream_event *ev);
 
   Input *origin () const;
   void set_spot (Input *i);
   bool internal_in_event_class (SCM class_name);
 
+  virtual SCM copy_mutable_properties () const;
+
   DECLARE_SCHEME_CALLBACK (undump, (SCM));
   DECLARE_SCHEME_CALLBACK (dump, (SCM));
-
 };
 
 #define in_event_class(class_name) internal_in_event_class (ly_symbol2scm (class_name))
 
 Stream_event *unsmob_stream_event (SCM);
 DECLARE_TYPE_P (Stream_event);
+SCM ly_event_deep_copy (SCM);
 
 #endif /* STREAM_EVENT_HH */