X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular-old.C;h=782d8e71d46fa6488635495ff0bba8bbb55d59eb;hb=5bca2431091765b1552cbb5410b1f2c18bbcb9c1;hp=ec9c0fe9bc2495f9b8d457097ed45efbec610500;hpb=85a5ea7bfc80e179a61a99f2955455e84d3384cc;p=lyx.git diff --git a/src/tabular-old.C b/src/tabular-old.C index ec9c0fe9bc..782d8e71d4 100644 --- a/src/tabular-old.C +++ b/src/tabular-old.C @@ -26,7 +26,7 @@ using std::strlen; 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); @@ -48,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)]; @@ -72,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); @@ -81,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; @@ -91,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; @@ -101,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)]; @@ -129,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())