1.1 --- a/process.cpp Thu Nov 23 16:18:26 2006 +0000
1.2 +++ b/process.cpp Fri Dec 08 20:18:56 2006 +0000
1.3 @@ -5,9 +5,9 @@
1.4 /////////////////////////////////////////////////////////////////
1.5 Process::Process()
1.6 {
1.7 - connect( this, SIGNAL(readyReadStderr()),
1.8 + connect( this, SIGNAL(readyReadStandardError()),
1.9 this, SLOT(readProcErrout()) );
1.10 - connect( this, SIGNAL(readyReadStdout()),
1.11 + connect( this, SIGNAL(readyReadStandardOutput()),
1.12 this, SLOT(readProcStdout()) );
1.13 clear();
1.14 }
1.15 @@ -24,7 +24,7 @@
1.16
1.17 void Process::waitFinished()
1.18 {
1.19 - while (isRunning())
1.20 + while (state()==QProcess::Running)
1.21 {
1.22 // FIXME use some kind of sleep here...
1.23 system ("sleep 1");
1.24 @@ -33,12 +33,12 @@
1.25
1.26 void Process::readProcErrout()
1.27 {
1.28 - errOut+=readStderr();
1.29 + errOut+=readAllStandardError();
1.30 }
1.31
1.32 void Process::readProcStdout()
1.33 {
1.34 - stdOut+=readStdout();
1.35 + stdOut+=readAllStandardOutput();
1.36 }
1.37
1.38 QString Process::getErrout()