* Another grand 2003 update.

[lilypond.git] / flower / include / string-data.hh

diff --git a/flower/include/string-data.hh b/flower/include/string-data.hh
index ecd71590748049998b835cba7d1c1446f26c4411..3f8ee18104a2e93d1952445c6a5c3984d59d61aa 100644 (file)
--- a/flower/include/string-data.hh
+++ b/flower/include/string-data.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -20,65 +20,65 @@ class String_data {
 friend class String_handle;
     int maxlen;        // maxlen is arraysize-1
     
-    int length_i_;
-    Byte* data_byte_p_;
+    int length_;
+    Byte* data_byte_;
     int references;
 
     /// init to ""
-    String_data();
+    String_data ();
 
     /// init from src. Conservative allocation.
-    String_data(String_data const &src); 
+    String_data (String_data const &src); 
     
-    ~String_data();
+    ~String_data ();
 
     /** POST: maxlen >= j.
-      @param j, maximum stringlength_i_.    
+      @param j, maximum stringlength_.    
       contents thrown away.
     */
-    void setmax(int j);
+    void setmax (int j);
     
     /** POST: maxlen >= j.
-      @param j, maximum stringlength_i_.
+      @param j, maximum stringlength_.
       contents are kept if it grows.
       */
-    void remax(int j);
+    void remax (int j);
 
     /// check if writeable.
-    void OKW();
+    void OKW ();
 
     /// check state.
-    void OK();
+    void OK ();
 
     /// reduce memory usage.
-    void tighten();
+    void tighten ();
 
     // assignment.
-    void set( Byte const* byte_c_l, int length_i );
+    void set (Byte const* byte, int length_i);
 
-    void set( char const* ch_c_l );
+    void set (char const* str0);
     
     /// concatenation.
-    void append( Byte const* byte_c_l, int length_i );
+    void append (Byte const* byte, int length_i);
 
-    void operator += ( char const* ch_c_l );
+    void operator += (char const* str0);
 
-    char const* ch_c_l() const; 
+    char const* to_str0 () const; 
 
-    char* ch_l();
+    char* get_str0 ();
 
-    Byte const* byte_c_l() const;
+    Byte const* to_bytes () const;
 
     // idem, non const
-    Byte* byte_l();
+    Byte* get_bytes ();
 
-    void trunc(int j);
+    void trunc (int j);
 
-    /** access element. not really safe. Can alter length_i_ without
+    /** access element. not really safe. Can alter length_ without
       #String_data# knowing it.  */
-    Byte &operator [](int j);
-    Byte operator [](int j) const;
-    bool is_binary_bo()const;
+    Byte &operator [] (int j);
+    Byte operator [] (int j) const;
+    bool is_binary_bo () const;
 };
 
 
@@ -87,7 +87,7 @@ friend class String_handle;
 #ifndef INLINE
 #define INLINE inline
 #endif
-#include "string-data.inl"
+#include "string-data.icc"
 
 #endif