X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclass.h;h=c2e36f3ea4a08bf6c0ca6fbf5d985a82e5468c77;hb=0da3d53269a49c66b24615d24e20e441dcf7c07e;hp=8dacb47c0a7725a9fc7a0d69063947d05644a32d;hpb=5a0176a6ebab29cee7959420a0b3a1768d9273ec;p=lyx.git

diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 8dacb47c0a..c2e36f3ea4 100644
--- a/src/lyxtextclass.h
+++ b/src/lyxtextclass.h
@@ -17,6 +17,11 @@
 
 #include <vector>
 
+
+namespace lyx {
+
+namespace support { class FileName; }
+
 class LyXLex;
 class Counters;
 class FloatList;
@@ -31,7 +36,7 @@ public:
 	std::string latexparam;
 	LyXFont font;
 	LyXFont labelfont;
-	std::string preamble;
+	docstring preamble;
 };
 
 
@@ -62,7 +67,7 @@ public:
 	const_iterator end() const { return layoutlist_.end(); }
 
 	/// Performs the read of the layout file.
-	bool read(std::string const & filename, bool merge = false);
+	bool read(support::FileName const & filename, bool merge = false);
 	///
 	void readOutputType(LyXLex &);
 	///
@@ -84,7 +89,7 @@ public:
 	LyXLayout_ptr const & operator[](std::string const & vname) const;
 
 	/// Sees to that the textclass structure has been loaded
-	bool load(std::string const & path=std::string()) const;
+	bool load(std::string const & path = std::string()) const;
 	/// Has this layout file been loaded yet?
 	bool loaded() const { return loaded_; }
 
@@ -119,7 +124,7 @@ public:
 	///
 	std::string const & pagestyle() const;
 	///
-	std::string const & preamble() const;
+	docstring const & preamble() const;
 
 	/// Packages that are already loaded by the class
 	enum Provides {
@@ -202,7 +207,7 @@ private:
 	///
 	std::string defaultlayout_;
 	/// preamble text to support layout styles
-	std::string preamble_;
+	docstring preamble_;
 	/// latex packages loaded by document class.
 	Provides provides_;
 	///
@@ -267,4 +272,7 @@ void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
 
+
+} // namespace lyx
+
 #endif