release: 0.1.11

[lilypond.git] / lily / include / general-script-def.hh

diff --git a/lily/include/general-script-def.hh b/lily/include/general-script-def.hh
index acaa554019b557b17b01b7eeede3e99ec40d1d81..3788df867cbd0fddc933595376e7b05076ddd891 100644 (file)
--- a/lily/include/general-script-def.hh
+++ b/lily/include/general-script-def.hh
@@ -13,6 +13,8 @@
 #include "lily-proto.hh"
 #include "input.hh"
 #include "virtual-methods.hh"
+#include "direction.hh"
+
 /**
   Definition of anything that is put aside staff/notes.
  */
@@ -20,18 +22,18 @@ class General_script_def : public Input {
 public:
     VIRTUAL_COPY_CONS(General_script_def,General_script_def);
     DECLARE_MY_RUNTIME_TYPEINFO;
-    virtual int staff_dir_i()const;
+    virtual Direction staff_dir() const;
     void print() const;
-    virtual int rel_stem_dir_i()const;
-    virtual int priority_i()const;
-    virtual bool inside_b()const;
-    virtual Atom get_atom(Paper_def* p, int dir_i_)const;
-    bool equal_b(General_script_def const&)const;
+    virtual Direction rel_stem_dir() const;
+    virtual int priority_i() const;
+    virtual bool inside_b() const;
+    virtual Atom get_atom (Paper_def* p, Direction dir_) const;
+    bool equal_b (General_script_def const&) const;
     virtual ~General_script_def() {}
     
 protected:
-    virtual bool do_equal_b(General_script_def const &)const;
-    virtual void do_print()const;
+    virtual bool do_equal_b (General_script_def const *) const;
+    virtual void do_print() const;
 };
 
 #endif // GENERAL_SCRIPT_DEF_HH