lilypond-0.1.48

diff --git a/flower/include/string.hh b/flower/include/string.hh
index 613202bb8c50201335fef4847b77e70596b427e0..3b6f2266faa1f026b6afdf1e0585ad409e38215a 100644 (file)
--- a/flower/include/string.hh
+++ b/flower/include/string.hh
@@ -13,8 +13,8 @@
 
 #include <string.h>
 #include <iostream.h>
-#include <Rational.h>
-
+#include "arithmetic-operator.hh"
+#include "fproto.hh"
 #include "string-handle.hh"
 
 /*
@@ -76,7 +76,6 @@ public:
   /** init to empty string. This is needed because other
     constructors are provided.*/
   String  ();
-  String (Rational);
 
   /// String s = "abc";
   String (char const* source); 
@@ -206,13 +205,7 @@ inline bool operator!=(char const* s1,String s2) {
   return String (s2) !=s1;
 }
 
-
-inline String
-operator  + (String s1, String  s2)
-{
-  s1 += s2;
-  return s1;
-}
+IMPLEMENT_ARITHMETIC_OPERATOR (String, +);
 
 inline ostream &
 operator << (ostream& os, String d)

diff --git a/flower/string.cc b/flower/string.cc
index 0e479de3e55bb37bc364c85c28d50a048cc0dc1e..65279ce0370549f4fef27267218f7bef051c067a 100644 (file)
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -54,12 +54,6 @@ String::operator = (String const&source)
   return *this;
 }
 
-
-String::String (Rational r)
-{
-  *this = String_convert::rational_str (r);
-}
-
 String::String (double f, char const* fmt)
 {
   *this= String_convert::double_str (f,fmt);