X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=48524f30a26070ba29bc164fddcea52848df84f1;hb=02c64e55c727447b2df4ba4fb0983d5679683db7;hp=56930afadc147f586f85d0dfcc5901822a4ef031;hpb=fc7f2d980528b0d2379be21298bc8a461a1e3712;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 56930afadc..48524f30a2 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -15,12 +15,16 @@
 
 
 #include "outputparams.h"
+#include "support/docstring.h"
 
 #include <set>
 #include <list>
 #include <map>
 #include <string>
 
+
+namespace lyx {
+
 class Buffer;
 class BufferParams;
 class Language;
@@ -42,7 +46,7 @@ class LaTeXFeatures {
 public:
 	///
 	LaTeXFeatures(Buffer const &, BufferParams const &,
-	              OutputParams const &);
+		      OutputParams const &);
 	/// The packages needed by the document
 	std::string const getPackages() const;
 	/// The macros definitions needed by the document
@@ -50,13 +54,13 @@ public:
 	///
 	std::string const getBabelOptions() const;
 	/// The definitions needed by the document's textclass
-	std::string const getTClassPreamble() const;
-	/// The sgml definitions needed by the document (dobook/linuxdoc)
-	std::string const getLyXSGMLEntities() const;
+	docstring const getTClassPreamble() const;
+	/// The sgml definitions needed by the document (docbook)
+	docstring const getLyXSGMLEntities() const;
 	/// The SGML Required to include the files added with includeFile();
-	std::string const getIncludedFiles(std::string const & fname) const;
+	docstring const getIncludedFiles(std::string const & fname) const;
 	/// Include a file for use with the SGML entities
-	void includeFile(std::string const & key, std::string const & name);
+	void includeFile(docstring const & key, std::string const & name);
 	/// The float definitions.
 	void getFloatDefinitions(std::ostream & os) const;
 	/// Print requirements to lyxerr
@@ -116,7 +120,7 @@ private:
 	///
 	UsedFloats usedFloats_;
 	///
-	typedef std::map<std::string , std::string> FileMap;
+	typedef std::map<docstring , std::string> FileMap;
 	///
 	FileMap IncludedFiles_;
 	/** Buffer of the file being processed.
@@ -133,4 +137,7 @@ private:
 	OutputParams const & runparams_;
 };
 
+
+} // namespace lyx
+
 #endif