lilypond-0.0.14

diff --git a/hdr/key.hh b/hdr/key.hh
index c65beea636795d89851ca52a5aff6eb119bca6c9..f0141d688f58c3238c43a89e65d636228ef48ad5 100644 (file)
--- a/hdr/key.hh
+++ b/hdr/key.hh
@@ -8,7 +8,7 @@
 #define KEY_HH
 
 #include "vray.hh"
-#include "string.hh"
+#include "scalar.hh"
 
 class Key {
     svec<int> accidentals;
@@ -16,8 +16,8 @@ class Key {
     /****************/
 
 public:
-    svec<int> read(svec<String> );
-    svec<int> oldkey_undo(svec<String>);
+    svec<int> read(svec<Scalar> );
+    svec<int> oldkey_undo(svec<Scalar>);
 
     Key();
     void set(int i, int acc);

diff --git a/hdr/meter.hh b/hdr/meter.hh
index 5498112d376c31dedfd27225354e7ac0a287ad73..a9db9c100a5399f549ff5e71f14c906f59d663d9 100644 (file)
--- a/hdr/meter.hh
+++ b/hdr/meter.hh
@@ -10,9 +10,9 @@
 #include "vray.hh"
 
 struct Meter: Item {
-    svec<String> args;
+    svec<Scalar> args;
     
-    Meter(svec<String> args) ;
+    Meter(svec<Scalar> args) ;
     void preprocess();
 };
 #endif // METER_HH