X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_plaintext.C;h=87919c0bf1e978dd76abd2f56bd7982bd1183ada;hb=b02d655347adec5e866e5014f4656b47e09cd269;hp=59039655954d7e91f34e42876529c46f90b4fc27;hpb=34b7650cbbe6a9ed2de812e75771451b8c8fe983;p=lyx.git

diff --git a/src/output_plaintext.C b/src/output_plaintext.C
index 5903965595..87919c0bf1 100644
--- a/src/output_plaintext.C
+++ b/src/output_plaintext.C
@@ -24,32 +24,32 @@
 
 #include "support/lstrings.h"
 
-using lyx::support::ascii_lowercase;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::compare_no_case;
-using lyx::support::contains;
 
-using lyx::docstring;
-using lyx::pos_type;
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::compare_ascii_no_case;
+using support::compare_no_case;
+using support::contains;
+using support::FileName;
+
 using std::endl;
 using std::ostream;
-using std::ofstream;
 using std::pair;
 using std::string;
 
 
-void writeFileAscii(Buffer const & buf,
-		    string const & fname,
-		    OutputParams const & runparams)
+void writeFileAscii(Buffer const & buf, FileName const & fname,
+	OutputParams const & runparams)
 {
-	lyx::odocfstream ofs;
-	if (!::openFileWrite(ofs, fname))
+	odocfstream ofs;
+	if (!openFileWrite(ofs, fname))
 		return;
 	writeFileAscii(buf, ofs, runparams);
 }
 
 
-void writeFileAscii(Buffer const & buf, lyx::odocstream & os,
+void writeFileAscii(Buffer const & buf, odocstream & os,
 	OutputParams const & runparams)
 {
 	bool ref_printed = false;
@@ -79,13 +79,13 @@ pair<int, docstring> const addDepth(int depth, int ldepth)
 
 void asciiParagraph(Buffer const & buf,
 		    Paragraph const & par,
-		    lyx::odocstream & os,
+		    odocstream & os,
 		    OutputParams const & runparams,
 		    bool & ref_printed)
 {
 	int ltype = 0;
-	Paragraph::depth_type ltype_depth = 0;
-	Paragraph::depth_type depth = par.params().depth();
+	depth_type ltype_depth = 0;
+	depth_type depth = par.params().depth();
 
 	// First write the layout
 	string const & tmp = par.layout()->name();
@@ -174,9 +174,7 @@ void asciiParagraph(Buffer const & buf,
 		break;
 
 	default: {
-		// FIXME UNICODE
-		docstring const label =
-			lyx::from_utf8(par.params().labelString());
+		docstring const label = par.params().labelString();
 		os << label << ' ';
 		currlinelen += label.length() + 1;
 		break;
@@ -197,7 +195,7 @@ void asciiParagraph(Buffer const & buf,
 	docstring word;
 
 	for (pos_type i = 0; i < par.size(); ++i) {
-		lyx::char_type c = par.getUChar(buf.params(), i);
+		char_type c = par.getUChar(buf.params(), i);
 		switch (c) {
 		case Paragraph::META_INSET: {
 			InsetBase const * inset = par.getInset(i);
@@ -248,3 +246,6 @@ void asciiParagraph(Buffer const & buf,
 	}
 	os << word;
 }
+
+
+} // namespace lyx