release: 1.5.19

[lilypond.git] / flower / string.cc

diff --git a/flower/string.cc b/flower/string.cc
index b7afe955f28074958b3fe10419e2281d304a5388..4659807f0c30c819a13c10a4360d20330c0b8a8a 100644 (file)
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -2,7 +2,7 @@
 
  string.cc - implement String
  
- (c)  1997--2000 Han-Wen Nienhuys & Jan Nieuwenhuizen
+  (c)  1997--2000 Han-Wen Nienhuys & Jan Nieuwenhuizen
 
  */
 
@@ -62,11 +62,6 @@ String::operator = (String const&source)
   return *this;
 }
 
-String::String (char const* source)
-{   
-  assert (source);    
-  strh_ = source;    
-}
 
 String::String (Byte const* byte_l, int length_i)
 {   
@@ -198,7 +193,7 @@ String::index_last_i (char const c) const
     return -1;
 
   char const* me = strh_.ch_C ();
-  char const* p = (char const*)memrchr ( (Byte*)me, length_i (), c);
+  char const* p = (char const*)memrchr ((Byte*)me, length_i (), c);
   if (p)
     return p - me;
   return -1;
@@ -254,7 +249,7 @@ String::index_i (String searchfor) const
 {
   char const* me = strh_.ch_C ();
 
-  char const* p =     (char const *) 
+  char const* p = (char const *) 
     memmem (me, length_i (), searchfor.ch_C (), searchfor.length_i ());
   
   if (p)
@@ -347,7 +342,7 @@ String::cut_str (int index_i, int n) const
   if (!length_i () || (index_i < 0) || (index_i >= length_i () ) || (n < 1 ) )
     return String ();
 
-  if ( (n > length_i ()) ||  (index_i + n > length_i () ) )
+  if ((n > length_i ()) || (index_i + n > length_i () ) )
     n = length_i () - index_i;
 
   return String (byte_C () + index_i, n);