X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular-old.C;h=782d8e71d46fa6488635495ff0bba8bbb55d59eb;hb=5bca2431091765b1552cbb5410b1f2c18bbcb9c1;hp=ff33d691b943ad832352354f88c49b31409b518a;hpb=26db00333da75fbbb43d1c31250c9ae482e931a1;p=lyx.git

diff --git a/src/tabular-old.C b/src/tabular-old.C
index ff33d691b9..782d8e71d4 100644
--- a/src/tabular-old.C
+++ b/src/tabular-old.C
@@ -3,7 +3,7 @@
  * 
  *           LyX, The Document Processor
  * 	 
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  *           @author: Jürgen Vigna
  *
@@ -20,15 +20,19 @@ using std::istream;
 using std::getline;
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
 
-static
-bool getTokenValue(string const & str, const char * token, string & ret)
+namespace {
+
+bool getTokenValue(string const & str, char const * token, string & ret)
 {
     size_t token_length = strlen(token);
     string::size_type pos = str.find(token);
 
-    if (pos == string::npos || pos+token_length+1 >= str.length()
-	|| str[pos+token_length] != '=')
+    if (pos == string::npos || pos + token_length + 1 >= str.length()
+	|| str[pos + token_length] != '=')
 	return false;
     ret.erase();
     pos += token_length + 1;
@@ -44,8 +48,7 @@ bool getTokenValue(string const & str, const char * token, string & ret)
 }
 
 
-static
-bool getTokenValue(string const & str, const char * token, int & num)
+bool getTokenValue(string const & str, char const * token, int & num)
 {
     string::size_type pos = str.find(token);
     char ch = str[pos + strlen(token)];
@@ -69,8 +72,7 @@ bool getTokenValue(string const & str, const char * token, int & num)
 }
 
 
-static
-bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
+bool getTokenValue(string const & str, char const * token, LyXAlignment & num)
 {
     int tmp;
     bool const ret = getTokenValue(str, token, tmp);
@@ -79,8 +81,7 @@ bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
 }
 
 
-static
-bool getTokenValue(string const & str, const char * token,
+bool getTokenValue(string const & str, char const * token,
 		   LyXTabular::VAlignment & num)
 {
     int tmp;
@@ -90,8 +91,7 @@ bool getTokenValue(string const & str, const char * token,
 }
 
 
-static
-bool getTokenValue(string const & str, const char * token,
+bool getTokenValue(string const & str, char const * token,
 		   LyXTabular::BoxType & num)
 {
     int tmp;
@@ -101,8 +101,7 @@ bool getTokenValue(string const & str, const char * token,
 }
 
 
-static
-bool getTokenValue(string const & str, const char * token, bool & flag)
+bool getTokenValue(string const & str, char const * token, bool & flag)
 {
     string::size_type pos = str.find(token);
     char ch = str[pos + strlen(token)];
@@ -126,14 +125,19 @@ bool getTokenValue(string const & str, const char * token, bool & flag)
 }
 
 
-static inline
+inline
 void l_getline(istream & is, string & str)
 {
+#ifdef WITH_WARNINGS
+//#warning old l_getline
+#endif
     getline(is, str);
     while(str.empty())
 	getline(is, str);
 }
 
+} // namespace anon
+
 
 void LyXTabular::ReadOld(Buffer const * buf, istream & is,
 			 LyXLex & lex, string const & l)
@@ -202,7 +206,7 @@ void LyXTabular::ReadOld(Buffer const * buf, istream & is,
 	    getTokenValue(line, "special", cell_info[i][j].align_special);
 	    l_getline(is, line);
 	    if (prefixIs(line, "\\begin_inset")) {
-		cell_info[i][j].inset.Read(buf, lex);
+		cell_info[i][j].inset.read(buf, lex);
 		l_getline(is, line);
 	    }
 	    if (line != "</Cell>") {