X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.C;h=0ac99a7850f501428d2a71d8ce868acc8155b094;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=bfd81ec5aba19385d40f0bec088c84c4abe89f4e;hpb=b27bb5cb53edeee088cf408eb37dd7d72586b90d;p=lyx.git diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C index bfd81ec5ab..0ac99a7850 100644 --- a/src/ParagraphParameters.C +++ b/src/ParagraphParameters.C @@ -28,23 +28,21 @@ #include -using lyx::docstring; -using lyx::support::rtrim; +namespace lyx { + +using support::rtrim; using std::istringstream; using std::ostream; using std::ostringstream; using std::string; -// anonym namespace -namespace { -int findToken(char const * const str[], string const & search_token) + +static int findToken(char const * const str[], string const & search_token) { return search_token == "default" ? 0 : - lyx::support::findToken(str, search_token); -} - + support::findToken(str, search_token); } @@ -61,7 +59,7 @@ void ParagraphParameters::clear() } -ParagraphParameters::depth_type ParagraphParameters::depth() const +depth_type ParagraphParameters::depth() const { return depth_; } @@ -241,7 +239,7 @@ void ParagraphParameters::write(ostream & os) const // The labelwidth string used in lists. if (!labelWidthString().empty()) os << "\\labelwidthstring " - << lyx::to_utf8(labelWidthString()) << '\n'; + << to_utf8(labelWidthString()) << '\n'; // Start of appendix? if (startOfAppendix()) @@ -314,3 +312,6 @@ bool operator==(ParagraphParameeters const & ps1, && ps1.leftindent == ps2.leftindent; } */ + + +} // namespace lyx