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

diff --git a/src/tabular-old.C b/src/tabular-old.C
index feb698e219..782d8e71d4 100644
--- a/src/tabular-old.C
+++ b/src/tabular-old.C
@@ -20,16 +20,19 @@ using std::istream;
 using std::getline;
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
 
 namespace {
 
-bool getTokenValue(string const & str, const char * token, string & ret)
+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;
@@ -45,7 +48,7 @@ bool getTokenValue(string const & str, const char * token, string & ret)
 }
 
 
-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,7 +72,7 @@ bool getTokenValue(string const & str, const char * token, int & num)
 }
 
 
-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);
@@ -78,7 +81,7 @@ bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
 }
 
 
-bool getTokenValue(string const & str, const char * token,
+bool getTokenValue(string const & str, char const * token,
 		   LyXTabular::VAlignment & num)
 {
     int tmp;
@@ -88,7 +91,7 @@ bool getTokenValue(string const & str, const char * token,
 }
 
 
-bool getTokenValue(string const & str, const char * token,
+bool getTokenValue(string const & str, char const * token,
 		   LyXTabular::BoxType & num)
 {
     int tmp;
@@ -98,7 +101,7 @@ bool getTokenValue(string const & str, const char * token,
 }
 
 
-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,7 +129,7 @@ inline
 void l_getline(istream & is, string & str)
 {
 #ifdef WITH_WARNINGS
-#warning old l_getline
+//#warning old l_getline
 #endif
     getline(is, str);
     while(str.empty())
@@ -203,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>") {