Kill LFUN_PARAGRAPH_SPACING in favour of LFUN_PARAGRAPH_PARAMS.

[lyx.git] / src / sgml.h

diff --git a/src/sgml.h b/src/sgml.h
index b4c02f5cc8511c258258b6c3975e1e16b8e6546f..ed0f1403a5475d9f59c01869a9ffe790cd204702 100644 (file)
--- 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 {
 
@@ -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
-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 +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