* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / include / item.hh

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 408e73ddebbc0834e3c5fe29c04d89493e0b8b81..8a0fd0b4b7b9ef4e2ec69a4b5643e22cc85a6c2d 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -12,7 +12,7 @@
 #include "box.hh"
 #include "grob.hh"
 #include "drul-array.hh"
-#include "protected-scm.hh"
+
 
 /**
   A horizontally fixed size element of the score.
@@ -30,22 +30,21 @@ public:
   Item (SCM);
   Item (Item const &);
 
-  static bool breakable_b (Grob*me);
+  static bool breakable_b (Grob *);
   bool broken_b () const;
   
   Direction break_status_dir () const;
   
-  Item * find_prebroken_piece (Direction) const;
-  Grob * find_broken_piece (System*) const;    
-
-  virtual System * line_l () const;
-  virtual Paper_column * column_l () const;
+  Item *find_prebroken_piece (Direction) const;
+  Grob *find_broken_piece (System *) const;    
+  virtual System *get_system () const;
+  virtual Paper_column *get_column () const;
   virtual void handle_prebroken_dependencies ();
-  static  bool has_interface (Grob*);
+  static  bool has_interface (Grob *);
 protected:
   virtual void discretionary_processing ();
   void copy_breakable_items ();
-  virtual SCM do_derived_mark ();
+  virtual SCM do_derived_mark () const;
 };