diff -r 5c5b4464b24f -r 876eed30ba3b process.cpp --- a/process.cpp Fri Mar 05 20:16:46 2010 +0000 +++ b/process.cpp Tue Mar 23 11:54:30 2010 +0000 @@ -1,13 +1,14 @@ #include "process.h" +#include ///////////////////////////////////////////////////////////////// // Process ///////////////////////////////////////////////////////////////// Process::Process() { - connect( this, SIGNAL(readyReadStderr()), + connect( this, SIGNAL(readyReadStandardError()), this, SLOT(readProcErrout()) ); - connect( this, SIGNAL(readyReadStdout()), + connect( this, SIGNAL(readyReadStandardOutput()), this, SLOT(readProcStdout()) ); clear(); } @@ -22,22 +23,14 @@ stdOut=""; } -void Process::waitFinished() -{ - while (isRunning()) - { - // FIXME use some kind of sleep here... - } -} - void Process::readProcErrout() { - errOut+=readStderr(); + errOut+=readAllStandardError(); } void Process::readProcStdout() { - stdOut+=readStdout(); + stdOut+=readAllStandardOutput(); } QString Process::getErrout()