lyx-devel.diff

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

diff --git a/src/support/LSubstring.C b/src/support/LSubstring.C
index 6c5509fdadafc90f7c4426d8dee2aae40ae642c3..ddf132c007f565f18d4cf61193e268cc75ab374a 100644 (file)
--- a/src/support/LSubstring.C
+++ b/src/support/LSubstring.C
@@ -3,8 +3,8 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1995-1998 The LyX Team.
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -12,6 +12,10 @@
 #include <config.h>
 #endif
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "LSubstring.h"
 
 
@@ -39,13 +43,13 @@ LSubstring::LSubstring(string & s, string::value_type const * p)
 LSubstring::LSubstring(string & s, LRegex const & r)
        : ps(&s)
 {
-       LRegex::MatchPair res = r.first_match(s);
+       LRegex::MatchPair const res = r.first_match(s);
        if (res.first != string::npos) {
                n = res.second;
                pos = res.first;
        } else {
                n = 0;
-               pos = 0;
+               pos = string::npos;
        }
 }
 
@@ -59,19 +63,19 @@ LSubstring & LSubstring::operator=(string const & s)
 
 LSubstring & LSubstring::operator=(LSubstring const & s)
 {
-       ps->replace(pos, n, string(s, 0, string::npos));
+       ps->replace(pos, n, s);
        return *this;
 }
 
 
-LSubstring & LSubstring::operator=(char const * p)
+LSubstring & LSubstring::operator=(string::value_type const * p)
 {
        ps->replace(pos, n, p);
        return *this;
 }
 
 
-LSubstring & LSubstring::operator=(char c)
+LSubstring & LSubstring::operator=(string::value_type c)
 {
        ps->replace(pos, n, 1, c);
        return *this;