mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-24 13:48:59 +00:00
fix init order
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32330 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0af92c85e9
commit
5dabc94547
@ -138,8 +138,8 @@ int Systemcall::startscript(Starttype how, string const & what)
|
|||||||
|
|
||||||
|
|
||||||
SystemcallPrivate::SystemcallPrivate(const std::string& of) :
|
SystemcallPrivate::SystemcallPrivate(const std::string& of) :
|
||||||
proc_(new QProcess), outindex_(0), process_events(false),
|
proc_(new QProcess), outindex_(0), errindex_(0),
|
||||||
errindex_(0), outfile(of), showout_(false), showerr_(false)
|
outfile(of), showout_(false), showerr_(false), process_events(false)
|
||||||
{
|
{
|
||||||
if (!outfile.empty()) {
|
if (!outfile.empty()) {
|
||||||
// Check whether we have to simply throw away the output.
|
// Check whether we have to simply throw away the output.
|
||||||
@ -167,6 +167,7 @@ void SystemcallPrivate::startProcess(const QString& cmd)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SystemcallPrivate::processEvents()
|
void SystemcallPrivate::processEvents()
|
||||||
{
|
{
|
||||||
if(process_events) {
|
if(process_events) {
|
||||||
@ -175,6 +176,7 @@ void SystemcallPrivate::processEvents()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SystemcallPrivate::waitAndProcessEvents()
|
void SystemcallPrivate::waitAndProcessEvents()
|
||||||
{
|
{
|
||||||
Sleep::millisec(100);
|
Sleep::millisec(100);
|
||||||
@ -217,7 +219,6 @@ bool SystemcallPrivate::waitWhile(State waitwhile, bool proc_events, int timeout
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SystemcallPrivate::~SystemcallPrivate()
|
SystemcallPrivate::~SystemcallPrivate()
|
||||||
{
|
{
|
||||||
flush();
|
flush();
|
||||||
@ -254,6 +255,7 @@ void SystemcallPrivate::flush()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SystemcallPrivate::stdOut()
|
void SystemcallPrivate::stdOut()
|
||||||
{
|
{
|
||||||
if (proc_ && showout_) {
|
if (proc_ && showout_) {
|
||||||
@ -364,6 +366,7 @@ QString SystemcallPrivate::exitStatusMessage() const
|
|||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int SystemcallPrivate::exitCode()
|
int SystemcallPrivate::exitCode()
|
||||||
{
|
{
|
||||||
if (!proc_)
|
if (!proc_)
|
||||||
@ -386,6 +389,7 @@ void SystemcallPrivate::killProcess()
|
|||||||
killProcess(proc_);
|
killProcess(proc_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SystemcallPrivate::killProcess(QProcess * p)
|
void SystemcallPrivate::killProcess(QProcess * p)
|
||||||
{
|
{
|
||||||
if (p) {
|
if (p) {
|
||||||
|
Loading…
Reference in New Issue
Block a user