-rw-r--r-- | core/qws/transferserver.cpp | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/core/qws/transferserver.cpp b/core/qws/transferserver.cpp index daf63ec..d0fec89 100644 --- a/core/qws/transferserver.cpp +++ b/core/qws/transferserver.cpp @@ -66,3 +66,4 @@ extern "C" #include "transferserver.h" -#include <opie/oprocess.h> +#include <opie2/oprocess.h> +using namespace Opie::Core; @@ -1051,7 +1052,7 @@ ServerDTP::ServerDTP( QObject *parent, const char* name) - gzipProc = new OProcess( this, "gzipProc" ); + gzipProc = new Opie::Core::OProcess( this, "gzipProc" ); - createTargzProc = new OProcess( QString("tar"), this, "createTargzProc"); + createTargzProc = new Opie::Core::OProcess( QString("tar"), this, "createTargzProc"); createTargzProc->setWorkingDirectory( QDir::rootDirPath() ); - connect( createTargzProc, SIGNAL( processExited(OProcess*) ), SLOT( targzDone() ) ); + connect( createTargzProc, SIGNAL( processExited(Opie::Core::OProcess*) ), SLOT( targzDone() ) ); @@ -1059,7 +1060,7 @@ ServerDTP::ServerDTP( QObject *parent, const char* name) args += "-xv"; - retrieveTargzProc = new OProcess( args, this, "retrieveTargzProc" ); + retrieveTargzProc = new Opie::Core::OProcess( args, this, "retrieveTargzProc" ); retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() ); - connect( retrieveTargzProc, SIGNAL( processExited(OProcess*) ), + connect( retrieveTargzProc, SIGNAL( processExited(Opie::Core::OProcess*) ), SIGNAL( completed() ) ); - connect( retrieveTargzProc, SIGNAL( processExited(OProcess*) ), + connect( retrieveTargzProc, SIGNAL( processExited(Opie::Core::OProcess*) ), SLOT( extractTarDone() ) ); @@ -1123,3 +1124,3 @@ void ServerDTP::connected() qDebug("==>start send tar process"); - if ( !createTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdout) ) + if ( !createTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdout) ) qWarning("Error starting %s or %s", @@ -1258,3 +1259,3 @@ void ServerDTP::readyRead() if ( !gzipProc->isRunning() ) - gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout )); + gzipProc->start(Opie::Core::OProcess::NotifyOnExit, (Opie::Core::OProcess::Communication) ( Opie::Core::OProcess::Stdin | Opie::Core::OProcess::Stdout )); @@ -1275,3 +1276,3 @@ void ServerDTP::readyRead() -void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen) +void ServerDTP::writeTargzBlock(Opie::Core::OProcess *, char *buffer, int buflen) { @@ -1283,4 +1284,4 @@ void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen) mode = Idle; - disconnect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ), - this, SLOT( writeTargzBlock(OProcess*,char*,int) ) ); + disconnect( gzipProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), + this, SLOT( writeTargzBlock(Opie::Core::OProcess*,char*,int) ) ); } @@ -1291,4 +1292,4 @@ void ServerDTP::targzDone() //qDebug("targz done"); - disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess*,char*,int) ), - this, SLOT( gzipTarBlock(OProcess*,char*,int) ) ); + disconnect( createTargzProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), + this, SLOT( gzipTarBlock(Opie::Core::OProcess*,char*,int) ) ); gzipProc->closeStdin(); @@ -1296,3 +1297,3 @@ void ServerDTP::targzDone() -void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen) +void ServerDTP::gzipTarBlock(Opie::Core::OProcess *, char *buffer, int buflen) { @@ -1301,3 +1302,3 @@ void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen) //qDebug("auto start gzip proc"); - gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout )); + gzipProc->start(Opie::Core::OProcess::NotifyOnExit, (Opie::Core::OProcess::Communication) ( Opie::Core::OProcess::Stdin | Opie::Core::OProcess::Stdout )); } @@ -1340,3 +1341,3 @@ void ServerDTP::sendGzipFile( const QString &fn, connect( createTargzProc, - SIGNAL( receivedStdout(OProcess*,char*,int) ), SLOT( gzipTarBlock(OProcess*,char*,int) ) ); + SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), SLOT( gzipTarBlock(Opie::Core::OProcess*,char*,int) ) ); @@ -1344,4 +1345,4 @@ void ServerDTP::sendGzipFile( const QString &fn, *gzipProc << "gzip"; - connect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ), - SLOT( writeTargzBlock(OProcess*,char*,int) ) ); + connect( gzipProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), + SLOT( writeTargzBlock(Opie::Core::OProcess*,char*,int) ) ); } @@ -1354,7 +1355,7 @@ void ServerDTP::gunzipDone() retrieveTargzProc->closeStdin(); - disconnect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ), - this, SLOT( tarExtractBlock(OProcess*,char*,int) ) ); + disconnect( gzipProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), + this, SLOT( tarExtractBlock(Opie::Core::OProcess*,char*,int) ) ); } -void ServerDTP::tarExtractBlock(OProcess *, char *buffer, int buflen) +void ServerDTP::tarExtractBlock(Opie::Core::OProcess *, char *buffer, int buflen) { @@ -1363,3 +1364,3 @@ void ServerDTP::tarExtractBlock(OProcess *, char *buffer, int buflen) qDebug("auto start ungzip proc"); - if ( !retrieveTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdin) ) + if ( !retrieveTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdin) ) qWarning(" failed to start tar -x process"); |