X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsgml.h;h=a46c9fa833a57990dc5910e924d334348ba3b877;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=b4c02f5cc8511c258258b6c3975e1e16b8e6546f;hpb=5d6963b0ca38f9197543f4a5945dc9200ac02871;p=lyx.git

diff --git a/src/sgml.h b/src/sgml.h
index b4c02f5cc8..a46c9fa833 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.
@@ -13,13 +13,7 @@
 #ifndef SGML_H
 #define SGML_H
 
-#include "support/types.h"
-#include "support/docstream.h"
-
-#include <iosfwd>
-#include <string>
-#include <utility>
-
+#include "support/docstring.h"
 
 namespace lyx {
 
@@ -39,11 +33,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
-std::string const uniqueID(std::string const label);
+docstring const uniqueID(docstring const & label);
 
 /// Opens tag
 void openTag(odocstream & os, std::string const & name,
@@ -59,7 +53,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