X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.h;h=ed8cbf314de7dc8bf2719aa473da0be0ee451519;hb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;hp=055f8638d59de941c1e65062a9967924a9f3270c;hpb=354fb450c2c0e63dc96c1764bbbc5233ecae21d9;p=lyx.git diff --git a/src/sgml.h b/src/sgml.h index 055f8638d5..ed8cbf314d 100644 --- a/src/sgml.h +++ b/src/sgml.h @@ -14,12 +14,7 @@ #define SGML_H #include "support/types.h" -#include "support/docstream.h" - -#include -#include -#include - +#include "support/docstring.h" namespace lyx { @@ -39,11 +34,11 @@ docstring escapeChar(char_type c); docstring escapeString(docstring const & raw); /// replaces illegal characters from SGML/XML ID attributes -std::string cleanID(Buffer const & buf, OutputParams const & runparams, - std::string const & orig); +docstring cleanID(Buffer const & buf, OutputParams const & runparams, + docstring const & orig); /// returns a unique numeric id -docstring const uniqueID(std::string const label); +docstring const uniqueID(docstring const label); /// Opens tag void openTag(odocstream & os, std::string const & name, @@ -59,7 +54,7 @@ void closeTag(odocstream & os, std::string const & name); /// Close tag void closeTag(odocstream & os, Paragraph const & par); - +} // namespace sgml } // namespace lyx -} + #endif // SGML_H