From cfafdae9300eb768269ff92118858128e2a8a515 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys & Jan Nieuwenhuizen <hanjan@lilypond.org>
Date: Wed, 19 Mar 1997 01:52:59 +0100
Subject: [PATCH] partial: 0.0.42.pre3.hanjan

---
 flower/{lib => }/include/pcursor.hh | 4 ++--
 flower/{lib => }/include/plist.hh   | 2 +-
 flower/{lib => }/include/plist.inl  | 0
 flower/{lib => }/string.cc          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename flower/{lib => }/include/pcursor.hh (93%)
 rename flower/{lib => }/include/plist.hh (96%)
 rename flower/{lib => }/include/plist.inl (100%)
 rename flower/{lib => }/string.cc (98%)

diff --git a/flower/lib/include/pcursor.hh b/flower/include/pcursor.hh
similarity index 93%
rename from flower/lib/include/pcursor.hh
rename to flower/include/pcursor.hh
index f1a098f71b..37512d553b 100644
--- a/flower/lib/include/pcursor.hh
+++ b/flower/include/pcursor.hh
@@ -53,8 +53,8 @@ public:
     T operator ->() const { return  ptr(); }
     operator T() { return ptr(); }
     T operator *() { return ptr(); }
-    void add(const T& p ) { Cursor<void*>::add((void*) p); }
-    void insert(const T& p ) { Cursor<void*>::insert((void*) p);}    
+    void add(T const & p ) { Cursor<void*>::add((void*) p); }
+    void insert(T const & p ) { Cursor<void*>::insert((void*) p);}    
     static int compare(PCursor<T> a,PCursor<T>b) {
 	return Cursor<void*>::compare(a,b);
     }
diff --git a/flower/lib/include/plist.hh b/flower/include/plist.hh
similarity index 96%
rename from flower/lib/include/plist.hh
rename to flower/include/plist.hh
index 426b861c02..f9af4c693b 100644
--- a/flower/lib/include/plist.hh
+++ b/flower/include/plist.hh
@@ -47,7 +47,7 @@ class PointerList : public List<void *>
 template<class T>
 class IPointerList : public PointerList<T> {
 public:
-    IPointerList(const IPointerList&) { set_empty(); }
+    IPointerList(IPointerList const &) { set_empty(); }
     IPointerList() { }
     ~IPointerList();
 };
diff --git a/flower/lib/include/plist.inl b/flower/include/plist.inl
similarity index 100%
rename from flower/lib/include/plist.inl
rename to flower/include/plist.inl
diff --git a/flower/lib/string.cc b/flower/string.cc
similarity index 98%
rename from flower/lib/string.cc
rename to flower/string.cc
index 9aa8bc9a92..3eaa5c1b09 100644
--- a/flower/lib/string.cc
+++ b/flower/string.cc
@@ -70,7 +70,7 @@ String::String( char c,  int n )
   @see
   String_convert::int_str
  */
-String::String(int i, const char * format )
+String::String(int i, char const * format )
 {
     *this = String_convert::int_str(i,format);
 }
@@ -240,7 +240,7 @@ String::index_any_i( String set ) const
     if ( !n )
 	return -1;
 
-    const void * me_l = (const void*) strh_.ch_c_l();
+    void const * me_l = (void const *) strh_.ch_c_l();
     for (int i=0; i  < set.length_i(); i++) {
 	char * found=(char*) memchr(me_l, set[i], n  );
 	if (found) {
-- 
2.39.5