X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=ee5905f141490de89a2050e5f765dfce626a3005;hb=1f83c98eb46b8c383714e69ee0e61592dd402aab;hp=eca24dcc8d821b77fbf09cc24621d42fc53b26ba;hpb=519e73acc8e1e764a3a9b5280a6b835ee4aae450;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index eca24dcc8d..ee5905f141 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -205,9 +205,9 @@ public:
 	///
 	std::string const & latexname() const { return latexname_; }
 	///
-	lyx::docstring const & labelstring() const { return labelstring_; }
+	docstring const & labelstring() const { return labelstring_; }
 	///
-	lyx::docstring const & endlabelstring() const { return endlabelstring_; }
+	docstring const & endlabelstring() const { return endlabelstring_; }
 	///
 	docstring const & preamble() const { return preamble_; }
 	///
@@ -219,7 +219,7 @@ public:
 	///
 	std::string const & itemtag() const { return itemtag_; }
 	///
-	lyx::docstring const & labelstring_appendix() const {
+	docstring const & labelstring_appendix() const {
 		return labelstring_appendix_;
 	}
 	/** Default font for this layout/environment.
@@ -250,15 +250,15 @@ public:
 	Font reslabelfont;
 
 	/// Text that dictates how wide the left margin is on the screen
-	std::string leftmargin;
+	docstring leftmargin;
 	/// Text that dictates how wide the right margin is on the screen
-	std::string rightmargin;
+	docstring rightmargin;
 	/// Text that dictates how much space to leave after a potential label
-	std::string labelsep;
+	docstring labelsep;
 	/// Text that dictates how much space to leave before a potential label
-	std::string labelindent;
+	docstring labelindent;
 	/// Text that dictates the width of the indentation of indented pars
-	std::string parindent;
+	docstring parindent;
 	///
 	double parskip;
 	///
@@ -341,7 +341,7 @@ public:
 	/// Does this layout allow for an optional parameter?
 	int optionalargs;
 	/// Which counter to step
-	lyx::docstring counter;
+	docstring counter;
 	/// Depth of XML command
 	int commanddepth;
 
@@ -369,11 +369,11 @@ private:
 	/// LaTeX name for environment
 	std::string latexname_;
 	/// Label string. "Abstract", "Reference", "Caption"...
-	lyx::docstring labelstring_;
+	docstring labelstring_;
 	///
-	lyx::docstring endlabelstring_;
+	docstring endlabelstring_;
 	/// Label string inside appendix. "Appendix", ...
-	lyx::docstring labelstring_appendix_;
+	docstring labelstring_appendix_;
 	/// LaTeX parameter for environment
 	std::string latexparam_;
 	/// Internal tag to use (e.g., <title></title> for sect header)