release: 0.1.11

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

diff --git a/lily/include/request.hh b/lily/include/request.hh
index f130120cf67b4648f81d4508a3c968c614e47dc6..e93f493176cc8f08f78c8888bc47a8acf92269b7 100644 (file)
--- a/lily/include/request.hh
+++ b/lily/include/request.hh
@@ -9,12 +9,13 @@
 #ifndef REQUEST_HH
 #define REQUEST_HH
 
-#include "glob.hh"
+
 #include "string.hh"
 #include "moment.hh"
 #include "virtual-methods.hh"
 #include "input.hh"
 #include "music.hh"
+#include "direction.hh"
 
 /**
  a voice element wants something printed.
@@ -29,11 +30,11 @@ public:
 
     virtual ~Request(){}
 
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
     VIRTUAL_COPY_CONS(Request,Music);
     
     virtual MInterval time_int() const;
-    virtual void transpose(Melodic_req const &){}
+    virtual void transpose (Melodic_req const &){}
     virtual Moment duration() const { return 0; }
 
     /*  accessors for children
@@ -46,13 +47,15 @@ public:
     virtual Blank_req * blank() { return 0; }
     virtual Musical_req *musical() { return 0; }
     virtual Command_req * command() { return 0; }
+    bool equal_b (Request*) const;
 protected:
-    virtual void do_print()const ;
+    virtual bool do_equal_b (Request*) const;
+    virtual void do_print() const;
 };
 
 #define REQUESTMETHODS(T,accessor)     \
 virtual T * accessor() { return this;}\
-NAME_MEMBERS();\
+DECLARE_MY_RUNTIME_TYPEINFO;\
 VIRTUAL_COPY_CONS(T, Request);\
 virtual void do_print() const
 
@@ -63,15 +66,16 @@ virtual void do_print() const
   this also a request */
 class Script_req  : public virtual Request { 
 public:
-    int dir_i_;
+    Direction dir_;
     General_script_def *scriptdef_p_;
 
     /* *************** */
-    static int compare(const Script_req &, const Script_req &);
+    bool do_equal_b (Request*) const;
+
     Script_req();
     REQUESTMETHODS(Script_req,script);
     ~Script_req();
-    Script_req(Script_req const&);
+    Script_req (Script_req const&);
 };