mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
Fix some other thinkos in r21048
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21757 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
9170e69786
commit
6820b61afa
@ -90,7 +90,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (filename.isReadable()) {
|
||||
if (filename.isFileReadable()) {
|
||||
Buffer * b = theBufferList().newBuffer(filename.absFilename());
|
||||
if (!b->loadLyXFile(filename)) {
|
||||
theBufferList().release(b);
|
||||
|
@ -348,7 +348,7 @@ string FileName::guessFormatFromContents() const
|
||||
// Z \037\235 UNIX compress
|
||||
// paranoia check
|
||||
|
||||
if (empty() || !isReadable())
|
||||
if (empty() || !isFileReadable())
|
||||
return string();
|
||||
|
||||
ifstream ifs(toFilesystemEncoding().c_str());
|
||||
|
@ -231,7 +231,7 @@ FileName const fileSearch(string const & path, string const & name,
|
||||
string const tmpname = replaceEnvironmentPath(name);
|
||||
FileName fullname(makeAbsPath(tmpname, path));
|
||||
// search first without extension, then with it.
|
||||
if (fullname.isReadable())
|
||||
if (fullname.isFileReadable())
|
||||
return fullname;
|
||||
if (ext.empty())
|
||||
// We are done.
|
||||
@ -240,7 +240,7 @@ FileName const fileSearch(string const & path, string const & name,
|
||||
// fullname.
|
||||
if (getExtension(fullname.absFilename()) != ext)
|
||||
fullname = FileName(addExtension(fullname.absFilename(), ext));
|
||||
if (fullname.isReadable() || mode == allow_unreadable)
|
||||
if (fullname.isFileReadable() || mode == allow_unreadable)
|
||||
return fullname;
|
||||
return FileName();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user