small changes read ChangeLog

[lyx.git] / src / support / lstrings.C

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 3d2a1c00e8ecb55954103e2dd2da7dfb2eeb0d78..f5908b2eaa6731ddfca9a70f59e4d1b854e5c9d0 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -1,5 +1,19 @@
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
+
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include <algorithm>
 
 #include <cctype>
@@ -141,7 +155,17 @@ double strToDbl(string const & str)
        }
 }
 
+/// 
+char lowercase(char c) 
+{ 
+       return tolower(c); 
+}
 
+/// 
+char uppercase(char c) 
+{ 
+       return toupper(c); 
+}
 
 string lowercase(string const & a)
 {
@@ -150,7 +174,7 @@ string lowercase(string const & a)
        string::iterator result = tmp.begin();
        for (string::iterator first = tmp.begin();
             first != tmp.end(); ++first, ++result) {
-               *result = tolower(*first);
+               *result = lowercase(*first);
        }
 //#else
 //     transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
@@ -166,7 +190,7 @@ string uppercase(string const & a)
        string::iterator result = tmp.begin();
        for (string::iterator first = tmp.begin();
             first != tmp.end(); ++first, ++result) {
-               *result = toupper(*first);
+               *result = uppercase(*first);
        }
 //#else
 //     transform(tmp.begin(), tmp.end(), tmp.begin(), toupper);
@@ -180,8 +204,18 @@ bool prefixIs(string const & a, char const * pre)
        unsigned int l = strlen(pre);
        if (l > a.length() || a.empty())
                return false;
-       else
+       else {
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+               // Delete this code when the compilers get a bit better.
+               return ::strncmp(a.c_str(), pre, l) == 0;
+#else
+               // This is the code that we really want to use
+               // but until gcc ships with a basic_string that
+               // implements std::string correctly we have to
+               // use the code above.
                return a.compare(0, l, pre, l) == 0;
+#endif
+       }
 }
 
 
@@ -198,7 +232,17 @@ bool suffixIs(string const & a, char const * suf)
        if (suflen > a.length())
                return false;
        else {
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+               // Delete this code when the compilers get a bit better.
+               string tmp(a, a.length() - suflen);
+               return ::strncmp(tmp.c_str(), suf, suflen) == 0;
+#else
+               // This is the code that we really want to use
+               // but until gcc ships with a basic_string that
+               // implements std::string correctly we have to
+               // use the code above.
                return a.compare(a.length() - suflen, suflen, suf) == 0;
+#endif
        }
 }