anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some other thinkos in r21048

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21757 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2007-11-24 01:34:46 +00:00
parent 9170e69786
commit 6820b61afa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buffer_funcs.cpp
View File

@ -90,7 +90,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
return 0; return 0;
} }
if (filename.isReadable()) { if (filename.isFileReadable()) {
Buffer * b = theBufferList().newBuffer(filename.absFilename()); Buffer * b = theBufferList().newBuffer(filename.absFilename());
if (!b->loadLyXFile(filename)) { if (!b->loadLyXFile(filename)) {
theBufferList().release(b); theBufferList().release(b);

2
src/support/FileName.cpp
View File

@ -348,7 +348,7 @@ string FileName::guessFormatFromContents() const
// Z \037\235 UNIX compress // Z \037\235 UNIX compress
// paranoia check // paranoia check
if (empty() || !isReadable()) if (empty() || !isFileReadable())
return string(); return string();
ifstream ifs(toFilesystemEncoding().c_str()); ifstream ifs(toFilesystemEncoding().c_str());

4
src/support/filetools.cpp
View File

@ -231,7 +231,7 @@ FileName const fileSearch(string const & path, string const & name,
string const tmpname = replaceEnvironmentPath(name); string const tmpname = replaceEnvironmentPath(name);
FileName fullname(makeAbsPath(tmpname, path)); FileName fullname(makeAbsPath(tmpname, path));
// search first without extension, then with it. // search first without extension, then with it.
if (fullname.isReadable()) if (fullname.isFileReadable())
return fullname; return fullname;
if (ext.empty()) if (ext.empty())
// We are done. // We are done.
@ -240,7 +240,7 @@ FileName const fileSearch(string const & path, string const & name,
// fullname. // fullname.
if (getExtension(fullname.absFilename()) != ext) if (getExtension(fullname.absFilename()) != ext)
fullname = FileName(addExtension(fullname.absFilename(), ext)); fullname = FileName(addExtension(fullname.absFilename(), ext));
if (fullname.isReadable() || mode == allow_unreadable) if (fullname.isFileReadable() || mode == allow_unreadable)
return fullname; return fullname;
return FileName(); return FileName();
} }