release: 0.1.24

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

diff --git a/flower/include/string.hh b/flower/include/string.hh
index 7682fa0bfbd7b2403db41c87c4ca6e7cb65b6569..91342a1de368bfb288669783decfeacd93de41bf 100644 (file)
--- a/flower/include/string.hh
+++ b/flower/include/string.hh
@@ -17,6 +17,13 @@
 
 #include "string-handle.hh"
 
+/**
+  technically incorrect, but lets keep it here: this is a
+  catch all place for this stuff.
+  */
+  
+#include "international.hh"
+
 /** 
  
   Intuitive string class. provides 
@@ -72,7 +79,7 @@ public:
   String (char c, int n = 1);
 
   String (int i , char const *fmt=0);
-  String ( double f , char const* fmt =0);
+  String (double f , char const* fmt =0);
   /// 'true' or 'false'
   String (bool);
 
@@ -84,23 +91,27 @@ public:
   char* ch_l();
   Byte* byte_l();
 
-  /// deprecated; use ch_C()
-  operator char const*() const { return ch_C(); }
-    
-  String &operator =( String const & source);
+  String &operator =(String const & source);
 
   /// concatenate s
   void operator += (char const* s) { strh_ += s; }
   void operator += (String s);
 
-  operator bool () 
+  bool empty_b () const;
+#if 0
+  /** is the string empty?
+
+    Ugh-ugh-thank-you-cygnus.  W32 barfs on this
+   */
+  operator bool () const;
   {
     return length_i (); 
   }
+#endif
   void append (String);
   void prepend (String);
 
-  char operator []( int n) const { return strh_[n]; }
+  char operator [](int n) const { return strh_[n]; }
 
   /// return n leftmost chars
   String left_str (int n) const;
@@ -185,7 +196,7 @@ operator  + (String s1, String  s2)
 }
 
 inline ostream &
-operator << ( ostream& os, String d)
+operator << (ostream& os, String d)
 {
   d.print_on (os);
   return os;