X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=d5163a09d4328c7ec2a5bc3cdf41d464baaac6eb;hb=559c2f648239fff4fec769b34b30ccff23491e31;hp=dc363fcf44aca1c76d63b9b5e000a375a36fb5c5;hpb=7cb5868e0306c8bf17e33f912e3e92d9c332217a;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index dc363fcf44..d5163a09d4 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -31,13 +31,6 @@
 
 #include "frontends/controllers/frontend_helpers.h"
 
-namespace lyx {
-
-using support::isSGMLFilename;
-using support::libFileSearch;
-using support::makeRelPath;
-using support::onlyPath;
-
 using std::endl;
 using std::find;
 using std::string;
@@ -46,6 +39,14 @@ using std::ostream;
 using std::ostringstream;
 using std::set;
 
+
+namespace lyx {
+
+using support::isSGMLFilename;
+using support::libFileSearch;
+using support::makeRelPath;
+using support::onlyPath;
+
 /////////////////////////////////////////////////////////////////////
 //
 // Strings
@@ -254,7 +255,7 @@ void LaTeXFeatures::getAvailable()
 }
 
 
-void LaTeXFeatures::useLayout(string const & layoutname)
+void LaTeXFeatures::useLayout(docstring const & layoutname)
 {
 	// Some code to avoid loops in dependency definition
 	static int level = 0;
@@ -262,15 +263,15 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 	if (level > maxlevel) {
 		lyxerr << "LaTeXFeatures::useLayout: maximum level of "
 		       << "recursion attained by layout "
-		       << layoutname << endl;
+		       << to_utf8(layoutname) << endl;
 		return;
 	}
 
 	TextClass const & tclass = params_.getTextClass();
 	if (tclass.hasLayout(layoutname)) {
 		// Is this layout already in usedLayouts?
-		list<string>::const_iterator cit = usedLayouts_.begin();
-		list<string>::const_iterator end = usedLayouts_.end();
+		list<docstring>::const_iterator cit = usedLayouts_.begin();
+		list<docstring>::const_iterator end = usedLayouts_.end();
 		for (; cit != end; ++cit) {
 			if (layoutname == *cit)
 				return;
@@ -285,7 +286,7 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 		usedLayouts_.push_back(layoutname);
 	} else {
 		lyxerr << "LaTeXFeatures::useLayout: layout `"
-		       << layoutname << "' does not exist in this class"
+		       << to_utf8(layoutname) << "' does not exist in this class"
 		       << endl;
 	}
 
@@ -712,8 +713,8 @@ docstring const LaTeXFeatures::getTClassPreamble() const
 
 	tcpreamble << tclass.preamble();
 
-	list<string>::const_iterator cit = usedLayouts_.begin();
-	list<string>::const_iterator end = usedLayouts_.end();
+	list<docstring>::const_iterator cit = usedLayouts_.begin();
+	list<docstring>::const_iterator end = usedLayouts_.end();
 	for (; cit != end; ++cit) {
 		tcpreamble << tclass[*cit]->preamble();
 	}