mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-25 17:44:59 +00:00
coding style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32326 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
1eb72710eb
commit
248712bc64
@ -105,10 +105,10 @@ int Systemcall::startscript(Starttype how, string const & what)
|
|||||||
QString cmd = toqstr(parsecmd(what, outfile));
|
QString cmd = toqstr(parsecmd(what, outfile));
|
||||||
SystemcallPrivate d(outfile);
|
SystemcallPrivate d(outfile);
|
||||||
|
|
||||||
bool processEvents = false;
|
bool process_events = false;
|
||||||
|
|
||||||
d.startProcess(cmd);
|
d.startProcess(cmd);
|
||||||
if (!d.waitWhile(SystemcallPrivate::Starting, processEvents, 3000)) {
|
if (!d.waitWhile(SystemcallPrivate::Starting, process_events, 3000)) {
|
||||||
LYXERR0("QProcess " << cmd << " did not start!");
|
LYXERR0("QProcess " << cmd << " did not start!");
|
||||||
LYXERR0("error " << d.errorMessage());
|
LYXERR0("error " << d.errorMessage());
|
||||||
return 10;
|
return 10;
|
||||||
@ -120,7 +120,7 @@ int Systemcall::startscript(Starttype how, string const & what)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!d.waitWhile(SystemcallPrivate::Running, processEvents, 180000)) {
|
if (!d.waitWhile(SystemcallPrivate::Running, process_events, 180000)) {
|
||||||
LYXERR0("QProcess " << cmd << " did not finished!");
|
LYXERR0("QProcess " << cmd << " did not finished!");
|
||||||
LYXERR0("error " << d.errorMessage());
|
LYXERR0("error " << d.errorMessage());
|
||||||
LYXERR0("status " << d.exitStatusMessage());
|
LYXERR0("status " << d.exitStatusMessage());
|
||||||
@ -175,14 +175,14 @@ void SystemcallPrivate::waitAndProcessEvents()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool SystemcallPrivate::waitWhile(State waitwhile, bool processEvents, int timeout)
|
bool SystemcallPrivate::waitWhile(State waitwhile, bool process_events, int timeout)
|
||||||
{
|
{
|
||||||
if (!proc_)
|
if (!proc_)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Block GUI while waiting,
|
// Block GUI while waiting,
|
||||||
// relay on QProcess' wait functions
|
// relay on QProcess' wait functions
|
||||||
if (!processEvents) {
|
if (!process_events) {
|
||||||
if (waitwhile == Starting)
|
if (waitwhile == Starting)
|
||||||
return proc_->waitForStarted(timeout);
|
return proc_->waitForStarted(timeout);
|
||||||
if (waitwhile == Running)
|
if (waitwhile == Running)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user