X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.C;h=824173ed83e3f76026d5b89db45b5528201fa0e9;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=3ad334d38ffd8c21e04e12eb722c819b20c1e7b9;hpb=c46b7d89553209b8df4e9de392ee07ef711f092f;p=lyx.git diff --git a/src/lyxlex.C b/src/lyxlex.C index 3ad334d38f..824173ed83 100644 --- a/src/lyxlex.C +++ b/src/lyxlex.C @@ -23,13 +23,16 @@ #include -using lyx::support::compare_ascii_no_case; -using lyx::support::isStrDbl; -using lyx::support::isStrInt; -using lyx::support::ltrim; -using lyx::support::prefixIs; -using lyx::support::subst; -using lyx::support::trim; + +namespace lyx { + +using support::compare_ascii_no_case; +using support::isStrDbl; +using support::isStrInt; +using support::ltrim; +using support::prefixIs; +using support::subst; +using support::trim; using std::endl; using std::string; @@ -147,7 +150,7 @@ string const LyXLex::getString() const } -lyx::docstring const LyXLex::getDocString() const +docstring const LyXLex::getDocString() const { return pimpl_->getDocString(); } @@ -263,6 +266,16 @@ LyXLex & LyXLex::operator>>(std::string & s) } +LyXLex & LyXLex::operator>>(docstring & s) +{ + if (isOK()) { + next(); + s = getDocString(); + } + return *this; +} + + LyXLex & LyXLex::operator>>(double & s) { if (isOK()) { @@ -310,3 +323,6 @@ string const LyXLex::quoteString(string const & arg) os << '"' << subst(subst(arg, "\\", "\\\\"), "\"", "\\\"") << '"'; return os.str(); } + + +} // namespace lyx