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

Remove direct calls of exit()

Browse Source 
This is a preparation for using QCoreApplication.
This commit is contained in:
Georg Baum 2015-01-09 21:43:45 +01:00
parent 8f2828197c
commit ca6fba31fb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tex2lyx/tex2lyx.cpp
View File

@ -482,13 +482,13 @@ void read_environment(Parser & p, string const & begin,
* has almost all of them listed. For the same reason the reLyX-specific
* reLyXre environment is ignored.
*/
void read_syntaxfile(FileName const & file_name)
bool read_syntaxfile(FileName const & file_name)
{
ifdocstream is(file_name.toFilesystemEncoding().c_str());
if (!is.good()) {
cerr << "Could not open syntax file \"" << file_name
<< "\" for reading." << endl;
exit(2);
return false;
}
// We can use our TeX parser, since the syntax of the layout file is
// modeled after TeX.
@ -514,6 +514,7 @@ void read_syntaxfile(FileName const & file_name)
}
}
}
return true;
}
@ -1047,9 +1048,11 @@ int main(int argc, char * argv[])
cerr << "Error: Could not find syntax file \"syntax.default\"." << endl;
return EXIT_FAILURE;
}
read_syntaxfile(system_syntaxfile);
if (!read_syntaxfile(system_syntaxfile))
return 2;
if (!syntaxfile.empty())
read_syntaxfile(makeAbsPath(syntaxfile));
if (!read_syntaxfile(makeAbsPath(syntaxfile)))
return 2;
// Read the encodings table.
FileName const symbols_path = libFileSearch(string(), "unicodesymbols");