X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.h;h=ed0f1403a5475d9f59c01869a9ffe790cd204702;hb=8ea66efe16ad109a5c107716185fb82bbebca8c8;hp=71b6aa1b6eec40e2aff8a8fec54681251a2132f0;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/sgml.h b/src/sgml.h
index 71b6aa1b6e..ed0f1403a5 100644
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author José Matos
+ * \author José Matos
  * \author John Levon
  *
  * Full author contact details are available in file CREDITS.
@@ -14,12 +14,7 @@
 #define SGML_H
 
 #include "support/types.h"
-#include "support/docstream.h"
-
-#include <iosfwd>
-#include <string>
-#include <utility>
-
+#include "support/docstring.h"
 
 namespace lyx {
 
@@ -31,20 +26,19 @@ namespace sgml {
 
 /**
  * Escape the given character, if necessary,
- * to an SGML entity. Returns true
- * if it was a whitespace character.
+ * to an SGML entity.
  */
-std::pair<bool, std::string> escapeChar(char c);
+docstring escapeChar(char_type c);
 
 /// Escape a word instead of a single character
-std::string escapeString(std::string const & raw);
+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
-std::string const uniqueID(std::string const label);
+docstring const uniqueID(docstring const label);
 
 /// Opens tag
 void openTag(odocstream & os, std::string const & name,
@@ -60,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