ws changes only

[lyx.git] / src / sgml.h

diff --git a/src/sgml.h b/src/sgml.h
index 7c34f5965b76ea8dcc1661db5603fc3e5b2b4d6d..73b23346c1b74b70b9d8807f794947e4ba320c49 100644 (file)
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -13,10 +13,10 @@
 #ifndef SGML_H
 #define SGML_H
 
-#include "LString.h"
+#include "support/types.h"
 
-#include <algorithm>
 #include <iosfwd>
+#include <utility>
 
 namespace sgml {
 
@@ -25,15 +25,15 @@ namespace sgml {
  * to an SGML entity. Returns true
  * if it was a whitespace character.
  */
-std::pair<bool, string> escapeChar(char c);
+std::pair<bool, std::string> escapeChar(char c);
 
 /// FIXME
-int openTag(std::ostream & os, Paragraph::depth_type depth,
-           bool mixcont, string const & latexname);
+int openTag(std::ostream & os, lyx::depth_type depth,
+           bool mixcont, std::string const & latexname);
 
 /// FIXME
-int closeTag(std::ostream & os, Paragraph::depth_type depth,
-           bool mixcont, string const & latexname);
+int closeTag(std::ostream & os, lyx::depth_type depth,
+           bool mixcont, std::string const & latexname);
 }
 
 #endif // SGML_H