really checkin

[lilypond.git] / flower / axis.cc

diff --git a/flower/axis.cc b/flower/axis.cc
index 8814f7723ef0843bc92709d0638f4678f00c2917..d26d2df06be1b12bc0f633dbc23f6fc2d12e564c 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -1,38 +1,15 @@
 /*
   axis.cc -- implement Axis
 
-
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <assert.h>
-#include "axes.hh"
+#include "axis.hh"
+
 #include "string.hh"
 
 String
-axis_name_str (Axis a)
+axis_name_string (Axis a)
 {
-  return to_str (char(a + 'x'));
+  return to_string (char (a + 'x'));
 }
-
-/*
-  TODO inline these.
- */
-Axis
-post_incr(Axis &a)
-{
-  assert(a < NO_AXES);
-  Axis b= a;
-  a = Axis(int(a) + 1);
-  return b;
-}
-
-Axis
-incr(Axis &a)
-{
-  assert(a < NO_AXES);
-  a = Axis(int(a) + 1);
-  return a;
-}
-