-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" | |||
66 | #include "transferserver.h" | 66 | #include "transferserver.h" |
67 | #include <opie/oprocess.h> | 67 | #include <opie2/oprocess.h> |
68 | using namespace Opie::Core; | ||
68 | 69 | ||
@@ -1051,7 +1052,7 @@ ServerDTP::ServerDTP( QObject *parent, const char* name) | |||
1051 | 1052 | ||
1052 | gzipProc = new OProcess( this, "gzipProc" ); | 1053 | gzipProc = new Opie::Core::OProcess( this, "gzipProc" ); |
1053 | 1054 | ||
1054 | createTargzProc = new OProcess( QString("tar"), this, "createTargzProc"); | 1055 | createTargzProc = new Opie::Core::OProcess( QString("tar"), this, "createTargzProc"); |
1055 | createTargzProc->setWorkingDirectory( QDir::rootDirPath() ); | 1056 | createTargzProc->setWorkingDirectory( QDir::rootDirPath() ); |
1056 | connect( createTargzProc, SIGNAL( processExited(OProcess*) ), SLOT( targzDone() ) ); | 1057 | connect( createTargzProc, SIGNAL( processExited(Opie::Core::OProcess*) ), SLOT( targzDone() ) ); |
1057 | 1058 | ||
@@ -1059,7 +1060,7 @@ ServerDTP::ServerDTP( QObject *parent, const char* name) | |||
1059 | args += "-xv"; | 1060 | args += "-xv"; |
1060 | retrieveTargzProc = new OProcess( args, this, "retrieveTargzProc" ); | 1061 | retrieveTargzProc = new Opie::Core::OProcess( args, this, "retrieveTargzProc" ); |
1061 | retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() ); | 1062 | retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() ); |
1062 | connect( retrieveTargzProc, SIGNAL( processExited(OProcess*) ), | 1063 | connect( retrieveTargzProc, SIGNAL( processExited(Opie::Core::OProcess*) ), |
1063 | SIGNAL( completed() ) ); | 1064 | SIGNAL( completed() ) ); |
1064 | connect( retrieveTargzProc, SIGNAL( processExited(OProcess*) ), | 1065 | connect( retrieveTargzProc, SIGNAL( processExited(Opie::Core::OProcess*) ), |
1065 | SLOT( extractTarDone() ) ); | 1066 | SLOT( extractTarDone() ) ); |
@@ -1123,3 +1124,3 @@ void ServerDTP::connected() | |||
1123 | qDebug("==>start send tar process"); | 1124 | qDebug("==>start send tar process"); |
1124 | if ( !createTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdout) ) | 1125 | if ( !createTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdout) ) |
1125 | qWarning("Error starting %s or %s", | 1126 | qWarning("Error starting %s or %s", |
@@ -1258,3 +1259,3 @@ void ServerDTP::readyRead() | |||
1258 | if ( !gzipProc->isRunning() ) | 1259 | if ( !gzipProc->isRunning() ) |
1259 | gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout )); | 1260 | gzipProc->start(Opie::Core::OProcess::NotifyOnExit, (Opie::Core::OProcess::Communication) ( Opie::Core::OProcess::Stdin | Opie::Core::OProcess::Stdout )); |
1260 | 1261 | ||
@@ -1275,3 +1276,3 @@ void ServerDTP::readyRead() | |||
1275 | 1276 | ||
1276 | void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen) | 1277 | void ServerDTP::writeTargzBlock(Opie::Core::OProcess *, char *buffer, int buflen) |
1277 | { | 1278 | { |
@@ -1283,4 +1284,4 @@ void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen) | |||
1283 | mode = Idle; | 1284 | mode = Idle; |
1284 | disconnect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 1285 | disconnect( gzipProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
1285 | this, SLOT( writeTargzBlock(OProcess*,char*,int) ) ); | 1286 | this, SLOT( writeTargzBlock(Opie::Core::OProcess*,char*,int) ) ); |
1286 | } | 1287 | } |
@@ -1291,4 +1292,4 @@ void ServerDTP::targzDone() | |||
1291 | //qDebug("targz done"); | 1292 | //qDebug("targz done"); |
1292 | disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 1293 | disconnect( createTargzProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
1293 | this, SLOT( gzipTarBlock(OProcess*,char*,int) ) ); | 1294 | this, SLOT( gzipTarBlock(Opie::Core::OProcess*,char*,int) ) ); |
1294 | gzipProc->closeStdin(); | 1295 | gzipProc->closeStdin(); |
@@ -1296,3 +1297,3 @@ void ServerDTP::targzDone() | |||
1296 | 1297 | ||
1297 | void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen) | 1298 | void ServerDTP::gzipTarBlock(Opie::Core::OProcess *, char *buffer, int buflen) |
1298 | { | 1299 | { |
@@ -1301,3 +1302,3 @@ void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen) | |||
1301 | //qDebug("auto start gzip proc"); | 1302 | //qDebug("auto start gzip proc"); |
1302 | gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout )); | 1303 | gzipProc->start(Opie::Core::OProcess::NotifyOnExit, (Opie::Core::OProcess::Communication) ( Opie::Core::OProcess::Stdin | Opie::Core::OProcess::Stdout )); |
1303 | } | 1304 | } |
@@ -1340,3 +1341,3 @@ void ServerDTP::sendGzipFile( const QString &fn, | |||
1340 | connect( createTargzProc, | 1341 | connect( createTargzProc, |
1341 | SIGNAL( receivedStdout(OProcess*,char*,int) ), SLOT( gzipTarBlock(OProcess*,char*,int) ) ); | 1342 | SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), SLOT( gzipTarBlock(Opie::Core::OProcess*,char*,int) ) ); |
1342 | 1343 | ||
@@ -1344,4 +1345,4 @@ void ServerDTP::sendGzipFile( const QString &fn, | |||
1344 | *gzipProc << "gzip"; | 1345 | *gzipProc << "gzip"; |
1345 | connect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 1346 | connect( gzipProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
1346 | SLOT( writeTargzBlock(OProcess*,char*,int) ) ); | 1347 | SLOT( writeTargzBlock(Opie::Core::OProcess*,char*,int) ) ); |
1347 | } | 1348 | } |
@@ -1354,7 +1355,7 @@ void ServerDTP::gunzipDone() | |||
1354 | retrieveTargzProc->closeStdin(); | 1355 | retrieveTargzProc->closeStdin(); |
1355 | disconnect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 1356 | disconnect( gzipProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
1356 | this, SLOT( tarExtractBlock(OProcess*,char*,int) ) ); | 1357 | this, SLOT( tarExtractBlock(Opie::Core::OProcess*,char*,int) ) ); |
1357 | } | 1358 | } |
1358 | 1359 | ||
1359 | void ServerDTP::tarExtractBlock(OProcess *, char *buffer, int buflen) | 1360 | void ServerDTP::tarExtractBlock(Opie::Core::OProcess *, char *buffer, int buflen) |
1360 | { | 1361 | { |
@@ -1363,3 +1364,3 @@ void ServerDTP::tarExtractBlock(OProcess *, char *buffer, int buflen) | |||
1363 | qDebug("auto start ungzip proc"); | 1364 | qDebug("auto start ungzip proc"); |
1364 | if ( !retrieveTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdin) ) | 1365 | if ( !retrieveTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdin) ) |
1365 | qWarning(" failed to start tar -x process"); | 1366 | qWarning(" failed to start tar -x process"); |