namespace lyx {
-using support::addName;
using support::bformat;
using support::FileFilterList;
+using support::FileName;
using support::ForkedProcess;
using support::isLyXFilename;
using support::libFileSearch;
bool menuWrite(Buffer * buffer)
{
if (buffer->save()) {
- LyX::ref().session().lastFiles().add(buffer->fileName());
+ LyX::ref().session().lastFiles().add(FileName(buffer->fileName()));
return true;
}
-bool writeAs(Buffer * buffer, string const & filename)
+bool writeAs(Buffer * buffer, string const & newname)
{
string fname = buffer->fileName();
string const oldname = fname;
- if (filename.empty()) {
+ if (newname.empty()) {
// FIXME UNICODE
FileDialog fileDlg(_("Choose a filename to save document as"),
return false;
// Make sure the absolute filename ends with appropriate suffix
- fname = makeAbsPath(fname);
+ fname = makeAbsPath(fname).absFilename();
if (!isLyXFilename(fname))
fname += ".lyx";
} else
- fname = filename;
+ fname = newname;
- if (fs::exists(fname)) {
+ FileName const filename(fname);
+ if (fs::exists(filename.toFilesystemEncoding())) {
docstring const file = makeDisplayPath(fname, 30);
docstring text = bformat(_("The document %1$s already exists.\n\n"
"Do you want to over-write that document?"), file);
class AutoSaveBuffer : public ForkedProcess {
public:
///
- AutoSaveBuffer(BufferView & bv, string const & fname)
+ AutoSaveBuffer(BufferView & bv, FileName const & fname)
: bv_(bv), fname_(fname) {}
///
virtual shared_ptr<ForkedProcess> clone() const
virtual int generateChild();
///
BufferView & bv_;
- string fname_;
+ FileName fname_;
};
int AutoSaveBuffer::start()
{
- command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_)));
+ command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_.absFilename())));
return run(DontWait);
}
// anyway.
bool failed = false;
- string const tmp_ret = tempName(string(), "lyxauto");
+ FileName const tmp_ret(tempName(FileName(), "lyxauto"));
if (!tmp_ret.empty()) {
bv_.buffer()->writeFile(tmp_ret);
// assume successful write of tmp_ret
fname += onlyFilename(bv->buffer()->fileName());
fname += '#';
- AutoSaveBuffer autosave(*bv, fname);
+ AutoSaveBuffer autosave(*bv, FileName(fname));
autosave.start();
bv->buffer()->markBakClean();
// Insert ascii file (if filename is empty, prompt for one)
string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph)
{
- string fname = f;
+ FileName fname(f);
if (fname.empty()) {
FileDialog fileDlg(_("Select file to insert"),
if (result.first == FileDialog::Later)
return string();
- fname = to_utf8(result.second);
+ fname = makeAbsPath(to_utf8(result.second));
if (fname.empty())
return string();
}
- if (!fs::is_readable(fname)) {
+ if (!fs::is_readable(fname.toFilesystemEncoding())) {
docstring const error = from_ascii(strerror(errno));
- docstring const file = makeDisplayPath(fname, 50);
+ docstring const file = makeDisplayPath(fname.absFilename(), 50);
docstring const text = bformat(_("Could not read the specified document\n"
"%1$s\ndue to the error: %2$s"), file, error);
Alert::error(_("Could not read file"), text);
return string();
}
- ifstream ifs(fname.c_str());
+ ifstream ifs(fname.toFilesystemEncoding().c_str());
if (!ifs) {
docstring const error = from_ascii(strerror(errno));
- docstring const file = makeDisplayPath(fname, 50);
+ docstring const file = makeDisplayPath(fname.absFilename(), 50);
docstring const text = bformat(_("Could not open the specified document\n"
"%1$s\ndue to the error: %2$s"), file, error);
Alert::error(_("Could not open file"), text);