X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=f4e64964cae3d84022be6a811d6c7d58fee500cf;hb=ca6838b288daf07eec7d7a381d74c639c0de3a46;hp=e81bcc1d5f4f95306e3b5b4db7baf27e9ed6c951;hpb=e4c3ce462791c85922d919f8859e3408f57d10fa;p=lyx.git

diff --git a/src/buffer.C b/src/buffer.C
index e81bcc1d5f..f4e64964ca 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -102,7 +102,6 @@ using support::createBufferTmpDir;
 using support::destroyDir;
 using support::FileName;
 using support::getFormatFromContents;
-using support::isDirWriteable;
 using support::libFileSearch;
 using support::latex_path;
 using support::ltrim;
@@ -142,7 +141,7 @@ using std::string;
 
 namespace {
 
-int const LYX_FORMAT = 255;
+int const LYX_FORMAT = 256;
 
 } // namespace anon
 
@@ -389,9 +388,8 @@ void Buffer::setReadonly(bool const flag)
 
 void Buffer::setFileName(string const & newfile)
 {
-	string const filename = makeAbsPath(newfile);
-	pimpl_->filename = FileName(filename);
-	params().filepath = onlyPath(filename);
+	pimpl_->filename = makeAbsPath(newfile);
+	params().filepath = onlyPath(pimpl_->filename.absFilename());
 	setReadonly(fs::is_readonly(pimpl_->filename.toFilesystemEncoding()));
 	updateTitles();
 }
@@ -569,11 +567,10 @@ void Buffer::insertStringAsLines(ParagraphList & pars,
 }
 
 
-bool Buffer::readFile(string const & filename)
+bool Buffer::readFile(FileName const & filename)
 {
 	// Check if the file is compressed.
-	FileName const name(makeAbsPath(filename));
-	string const format = getFormatFromContents(name);
+	string const format = getFormatFromContents(filename);
 	if (format == "gzip" || format == "zip" || format == "compress") {
 		params().compressed = true;
 	}
@@ -581,7 +578,7 @@ bool Buffer::readFile(string const & filename)
 	// remove dummy empty par
 	paragraphs().clear();
 	LyXLex lex(0, 0);
-	lex.setFile(name);
+	lex.setFile(filename);
 	if (!readFile(lex, filename))
 		return false;
 
@@ -606,13 +603,13 @@ void Buffer::fully_loaded(bool const value)
 }
 
 
-bool Buffer::readFile(LyXLex & lex, string const & filename)
+bool Buffer::readFile(LyXLex & lex, FileName const & filename)
 {
 	BOOST_ASSERT(!filename.empty());
 
 	if (!lex.isOK()) {
 		Alert::error(_("Document could not be read"),
-			     bformat(_("%1$s could not be read."), from_utf8(filename)));
+			     bformat(_("%1$s could not be read."), from_utf8(filename.absFilename())));
 		return false;
 	}
 
@@ -621,7 +618,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 
 	if (!lex.isOK()) {
 		Alert::error(_("Document could not be read"),
-			     bformat(_("%1$s could not be read."), from_utf8(filename)));
+			     bformat(_("%1$s could not be read."), from_utf8(filename.absFilename())));
 		return false;
 	}
 
@@ -631,7 +628,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 
 		Alert::error(_("Document format failure"),
 			     bformat(_("%1$s is not a LyX document."),
-				       from_utf8(filename)));
+				       from_utf8(filename.absFilename())));
 		return false;
 	}
 
@@ -647,14 +644,14 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 	//lyxerr << "format: " << file_format << endl;
 
 	if (file_format != LYX_FORMAT) {
-		string const tmpfile = tempName();
+		FileName const tmpfile(tempName());
 		if (tmpfile.empty()) {
 			Alert::error(_("Conversion failed"),
 				     bformat(_("%1$s is from an earlier"
 					      " version of LyX, but a temporary"
 					      " file for converting it could"
 							    " not be created."),
-					      from_utf8(filename)));
+					      from_utf8(filename.absFilename())));
 			return false;
 		}
 		FileName const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx");
@@ -664,14 +661,15 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 					       " version of LyX, but the"
 					       " conversion script lyx2lyx"
 							    " could not be found."),
-					       from_utf8(filename)));
+					       from_utf8(filename.absFilename())));
 			return false;
 		}
 		ostringstream command;
-		command << os::python() << ' ' << quoteName(lyx2lyx.toFilesystemEncoding())
-			<< " -t " << convert<string>(LYX_FORMAT)
-			<< " -o " << quoteName(tmpfile) << ' '
-			<< quoteName(filename);
+		command << os::python()
+		        << ' ' << quoteName(lyx2lyx.toFilesystemEncoding())
+		        << " -t " << convert<string>(LYX_FORMAT)
+		        << " -o " << quoteName(tmpfile.toFilesystemEncoding())
+		        << ' ' << quoteName(filename.toFilesystemEncoding());
 		string const command_str = command.str();
 
 		lyxerr[Debug::INFO] << "Running '"
@@ -684,7 +682,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 				     bformat(_("%1$s is from an earlier version"
 					      " of LyX, but the lyx2lyx script"
 							    " failed to convert it."),
-					      from_utf8(filename)));
+					      from_utf8(filename.absFilename())));
 			return false;
 		} else {
 			bool const ret = readFile(tmpfile);
@@ -698,7 +696,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 		Alert::error(_("Document format failure"),
 			     bformat(_("%1$s ended unexpectedly, which means"
 						    " that it is probably corrupted."),
-				       from_utf8(filename)));
+				       from_utf8(filename.absFilename())));
 	}
 
 	//lyxerr << "removing " << MacroTable::localMacros().size()