summaryrefslogtreecommitdiff
authorar <ar>2004-05-02 17:11:49 (UTC)
committer ar <ar>2004-05-02 17:11:49 (UTC)
commit18759e9156c96795831120408a9da0d3b4ec71a4 (patch) (unidiff)
treebfc1a5560340b77a1918855e9915d133898ec189
parent4d3379027557e251201b531896974a69ae4c665a (diff)
downloadopie-18759e9156c96795831120408a9da0d3b4ec71a4.zip
opie-18759e9156c96795831120408a9da0d3b4ec71a4.tar.gz
opie-18759e9156c96795831120408a9da0d3b4ec71a4.tar.bz2
- convert qDebug to odebug
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/qws/qcopbridge.cpp18
-rw-r--r--core/qws/transferserver.cpp82
2 files changed, 54 insertions, 46 deletions
diff --git a/core/qws/qcopbridge.cpp b/core/qws/qcopbridge.cpp
index 4fd0807..822efb7 100644
--- a/core/qws/qcopbridge.cpp
+++ b/core/qws/qcopbridge.cpp
@@ -21,15 +21,19 @@
21#include "qcopbridge.h" 21#include "qcopbridge.h"
22#include "transferserver.h" 22#include "transferserver.h"
23 23
24/* OPIE */
24#include <qpe/qcopenvelope_qws.h> 25#include <qpe/qcopenvelope_qws.h>
25#include <qpe/qpeapplication.h> 26#include <qpe/qpeapplication.h>
26#include <qpe/version.h> 27#include <qpe/version.h>
28#include <opie2/odebug.h>
27 29
30/* QT */
28#include <qtextstream.h> 31#include <qtextstream.h>
29#ifdef QWS 32#ifdef QWS
30#include <qcopchannel_qws.h> 33#include <qcopchannel_qws.h>
31#endif 34#endif
32 35
36/* STD */
33#define _XOPEN_SOURCE 37#define _XOPEN_SOURCE
34#include <pwd.h> 38#include <pwd.h>
35#include <sys/types.h> 39#include <sys/types.h>
@@ -50,7 +54,7 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent ,
50 cardChannel( 0 ) 54 cardChannel( 0 )
51{ 55{
52 if ( !ok() ) 56 if ( !ok() )
53 qWarning( "Failed to bind to port %d", port ); 57 owarn << "Failed to bind to port " << port << "" << oendl;
54 else { 58 else {
55#ifndef QT_NO_COP 59#ifndef QT_NO_COP
56 desktopChannel = new QCopChannel( "QPE/Desktop", this ); 60 desktopChannel = new QCopChannel( "QPE/Desktop", this );
@@ -110,13 +114,13 @@ void QCopBridge::desktopMessage( const QCString &command, const QByteArray &args
110 114
111 int paren = command.find( "(" ); 115 int paren = command.find( "(" );
112 if ( paren <= 0 ) { 116 if ( paren <= 0 ) {
113 qDebug("DesktopMessage: bad qcop syntax"); 117 odebug << "DesktopMessage: bad qcop syntax" << oendl;
114 return; 118 return;
115 } 119 }
116 120
117 QString params = command.mid( paren + 1 ); 121 QString params = command.mid( paren + 1 );
118 if ( params[params.length()-1] != ')' ) { 122 if ( params[params.length()-1] != ')' ) {
119 qDebug("DesktopMessage: bad qcop syntax"); 123 odebug << "DesktopMessage: bad qcop syntax" << oendl;
120 return; 124 return;
121 } 125 }
122 126
@@ -143,7 +147,7 @@ void QCopBridge::desktopMessage( const QCString &command, const QByteArray &args
143 stream >> i; 147 stream >> i;
144 str = QString::number( i ); 148 str = QString::number( i );
145 } else { 149 } else {
146 qDebug(" cannot route the argument type %s throught the qcop bridge", (*it).latin1() ); 150 odebug << " cannot route the argument type " << (*it) << " throught the qcop bridge" << oendl;
147 return; 151 return;
148 } 152 }
149 QString estr; 153 QString estr;
@@ -235,7 +239,7 @@ QCopBridgePI::~QCopBridgePI()
235void QCopBridgePI::connectionClosed() 239void QCopBridgePI::connectionClosed()
236{ 240{
237 emit connectionClosed( this ); 241 emit connectionClosed( this );
238 // qDebug( "Debug: Connection closed" ); 242 // odebug << "Debug: Connection closed" << oendl;
239 delete this; 243 delete this;
240} 244}
241 245
@@ -250,7 +254,7 @@ void QCopBridgePI::send( const QString& msg )
250{ 254{
251 QTextStream os( this ); 255 QTextStream os( this );
252 os << msg << endl; 256 os << msg << endl;
253 //qDebug( "sending qcop message: %s", msg.latin1() ); 257 //odebug << "sending qcop message: " << msg << "" << oendl;
254} 258}
255 259
256void QCopBridgePI::read() 260void QCopBridgePI::read()
@@ -261,7 +265,7 @@ void QCopBridgePI::read()
261 265
262void QCopBridgePI::process( const QString& message ) 266void QCopBridgePI::process( const QString& message )
263{ 267{
264 //qDebug( "Command: %s", message.latin1() ); 268 //odebug << "Command: " << message << "" << oendl;
265 269
266 // split message using "," as separator 270 // split message using "," as separator
267 QStringList msg = QStringList::split( " ", message ); 271 QStringList msg = QStringList::split( " ", message );
diff --git a/core/qws/transferserver.cpp b/core/qws/transferserver.cpp
index d0fec89..777c384 100644
--- a/core/qws/transferserver.cpp
+++ b/core/qws/transferserver.cpp
@@ -17,6 +17,10 @@
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20
21/* OPIE */
22#include <opie2/odebug.h>
23
20#define _XOPEN_SOURCE 24#define _XOPEN_SOURCE
21#include <pwd.h> 25#include <pwd.h>
22#include <sys/types.h> 26#include <sys/types.h>
@@ -74,7 +78,7 @@ TransferServer::TransferServer( Q_UINT16 port, QObject *parent ,
74 : QServerSocket( port, 1, parent, name ) 78 : QServerSocket( port, 1, parent, name )
75{ 79{
76 if ( !ok() ) 80 if ( !ok() )
77 qWarning( "Failed to bind to port %d", port ); 81 owarn << "Failed to bind to port " << port << "" << oendl;
78} 82}
79 83
80TransferServer::~TransferServer() 84TransferServer::~TransferServer()
@@ -317,7 +321,7 @@ ServerPI::~ServerPI()
317 321
318void ServerPI::connectionClosed() 322void ServerPI::connectionClosed()
319{ 323{
320 // qDebug( "Debug: Connection closed" ); 324 // odebug << "Debug: Connection closed" << oendl;
321 delete this; 325 delete this;
322} 326}
323 327
@@ -325,7 +329,7 @@ void ServerPI::send( const QString& msg )
325{ 329{
326 QTextStream os( this ); 330 QTextStream os( this );
327 os << msg << endl; 331 os << msg << endl;
328 //qDebug( "Reply: %s", msg.latin1() ); 332 //odebug << "Reply: " << msg << "" << oendl;
329} 333}
330 334
331void ServerPI::read() 335void ServerPI::read()
@@ -366,7 +370,7 @@ bool ServerPI::checkWriteFile( const QString& file )
366 370
367void ServerPI::process( const QString& message ) 371void ServerPI::process( const QString& message )
368{ 372{
369 //qDebug( "Command: %s", message.latin1() ); 373 //odebug << "Command: " << message << "" << oendl;
370 374
371 // split message using "," as separator 375 // split message using "," as separator
372 QStringList msg = QStringList::split( " ", message ); 376 QStringList msg = QStringList::split( " ", message );
@@ -391,7 +395,7 @@ void ServerPI::process( const QString& message )
391 args = copy.join( " " ); 395 args = copy.join( " " );
392 } 396 }
393 397
394 //qDebug( "args: %s", args.latin1() ); 398 //odebug << "args: " << args << "" << oendl;
395 399
396 // we always respond to QUIT, regardless of state 400 // we always respond to QUIT, regardless of state
397 if ( cmd == "QUIT" ) { 401 if ( cmd == "QUIT" ) {
@@ -527,7 +531,7 @@ void ServerPI::process( const QString& message )
527 sendFile( absFilePath( args ) ); 531 sendFile( absFilePath( args ) );
528 } 532 }
529 else { 533 else {
530 qDebug("550 Requested action not taken"); 534 odebug << "550 Requested action not taken" << oendl;
531 send( "550 Requested action not taken" ); 535 send( "550 Requested action not taken" );
532 } 536 }
533 537
@@ -633,7 +637,7 @@ void ServerPI::process( const QString& message )
633 // make directory (MKD) 637 // make directory (MKD)
634 else if ( cmd == "MKD" ) { 638 else if ( cmd == "MKD" ) {
635 if ( args.isEmpty() ) { 639 if ( args.isEmpty() ) {
636 qDebug(" Error: no arg"); 640 odebug << " Error: no arg" << oendl;
637 send( "500 Syntax error, command unrecognized" ); 641 send( "500 Syntax error, command unrecognized" );
638 } 642 }
639 else { 643 else {
@@ -673,7 +677,7 @@ void ServerPI::process( const QString& message )
673 duproc.addArgument("-s"); 677 duproc.addArgument("-s");
674 QString in, out; 678 QString in, out;
675 if ( !duproc.exec(in, out) ) { 679 if ( !duproc.exec(in, out) ) {
676 qDebug("du process failed; just sending back 1K"); 680 odebug << "du process failed; just sending back 1K" << oendl;
677 send( "213 1024"); 681 send( "213 1024");
678 } 682 }
679 else { 683 else {
@@ -681,7 +685,7 @@ void ServerPI::process( const QString& message )
681 int guess = size.toInt() / 5; 685 int guess = size.toInt() / 5;
682 if ( filePath.contains("doc") ) 686 if ( filePath.contains("doc") )
683 guess *= 1000; 687 guess *= 1000;
684 qDebug("sending back gzip guess of %d", guess); 688 odebug << "sending back gzip guess of " << guess << "" << oendl;
685 send( "213 " + QString::number(guess) ); 689 send( "213 " + QString::number(guess) );
686 } 690 }
687 } 691 }
@@ -736,8 +740,8 @@ bool ServerPI::backupRestoreGzip( const QString &file, QStringList &targets )
736 file.findRev( ".tgz" ) == (int)file.length() - 4 ) { 740 file.findRev( ".tgz" ) == (int)file.length() - 4 ) {
737 QFileInfo info( file ); 741 QFileInfo info( file );
738 targets = info.dirPath( TRUE ); 742 targets = info.dirPath( TRUE );
739 qDebug("ServerPI::backupRestoreGzip for %s = %s", file.latin1(), 743 odebug << "ServerPI::backupRestoreGzip for " << file.latin1() << " = "
740 targets.join(" ").latin1() ); 744 << targets.join(" ").latin1() << oendl;
741 return true; 745 return true;
742 } 746 }
743 return false; 747 return false;
@@ -984,7 +988,7 @@ QString ServerPI::permissionString( QFileInfo *info )
984 988
985void ServerPI::newConnection( int socket ) 989void ServerPI::newConnection( int socket )
986{ 990{
987 //qDebug( "New incomming connection" ); 991 //odebug << "New incomming connection" << oendl;
988 992
989 if ( !passiv ) 993 if ( !passiv )
990 return ; 994 return ;
@@ -998,7 +1002,7 @@ void ServerPI::newConnection( int socket )
998 dtp->setSocket( socket ); 1002 dtp->setSocket( socket );
999 } 1003 }
1000 else if ( wait[RetrieveFile] ) { 1004 else if ( wait[RetrieveFile] ) {
1001 qDebug("check retrieve file"); 1005 odebug << "check retrieve file" << oendl;
1002 if ( backupRestoreGzip( waitfile ) ) 1006 if ( backupRestoreGzip( waitfile ) )
1003 dtp->retrieveGzipFile( waitfile ); 1007 dtp->retrieveGzipFile( waitfile );
1004 else 1008 else
@@ -1010,7 +1014,7 @@ void ServerPI::newConnection( int socket )
1010 dtp->setSocket( socket ); 1014 dtp->setSocket( socket );
1011 } 1015 }
1012 else if ( wait[RetrieveByteArray] ) { 1016 else if ( wait[RetrieveByteArray] ) {
1013 qDebug("retrieve byte array"); 1017 odebug << "retrieve byte array" << oendl;
1014 dtp->retrieveByteArray(); 1018 dtp->retrieveByteArray();
1015 dtp->setSocket( socket ); 1019 dtp->setSocket( socket );
1016 } 1020 }
@@ -1075,7 +1079,7 @@ ServerDTP::~ServerDTP()
1075 1079
1076void ServerDTP::extractTarDone() 1080void ServerDTP::extractTarDone()
1077{ 1081{
1078 qDebug("extract done"); 1082 odebug << "extract done" << oendl;
1079#ifndef QT_NO_COP 1083#ifndef QT_NO_COP
1080 1084
1081 QCopEnvelope e( "QPE/Desktop", "restoreDone(QString)" ); 1085 QCopEnvelope e( "QPE/Desktop", "restoreDone(QString)" );
@@ -1094,7 +1098,7 @@ void ServerDTP::connected()
1094 return ; 1098 return ;
1095 } 1099 }
1096 1100
1097 //qDebug( "Debug: Sending file '%s'", file.name().latin1() ); 1101 //odebug << "Debug: Sending file '" << file.name() << "'" << oendl;
1098 1102
1099 bytes_written = 0; 1103 bytes_written = 0;
1100 if ( file.size() == 0 ) { 1104 if ( file.size() == 0 ) {
@@ -1116,12 +1120,12 @@ void ServerDTP::connected()
1116 case SendGzipFile: 1120 case SendGzipFile:
1117 if ( createTargzProc->isRunning() ) { 1121 if ( createTargzProc->isRunning() ) {
1118 // SHOULDN'T GET HERE, BUT DOING A SAFETY CHECK ANYWAY 1122 // SHOULDN'T GET HERE, BUT DOING A SAFETY CHECK ANYWAY
1119 qWarning("Previous tar --gzip process is still running; killing it..."); 1123 owarn << "Previous tar --gzip process is still running; killing it..." << oendl;
1120 createTargzProc->kill(); 1124 createTargzProc->kill();
1121 } 1125 }
1122 1126
1123 bytes_written = 0; 1127 bytes_written = 0;
1124 qDebug("==>start send tar process"); 1128 odebug << "==>start send tar process" << oendl;
1125 if ( !createTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdout) ) 1129 if ( !createTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdout) )
1126 qWarning("Error starting %s or %s", 1130 qWarning("Error starting %s or %s",
1127 createTargzProc->args()[0].data(), 1131 createTargzProc->args()[0].data(),
@@ -1134,7 +1138,7 @@ void ServerDTP::connected()
1134 return ; 1138 return ;
1135 } 1139 }
1136 1140
1137 // qDebug( "Debug: Sending byte array" ); 1141 // odebug << "Debug: Sending byte array" << oendl;
1138 bytes_written = 0; 1142 bytes_written = 0;
1139 while ( !buf.atEnd() ) 1143 while ( !buf.atEnd() )
1140 putch( buf.getch() ); 1144 putch( buf.getch() );
@@ -1153,10 +1157,10 @@ void ServerDTP::connected()
1153 mode = Idle; 1157 mode = Idle;
1154 return ; 1158 return ;
1155 } 1159 }
1156 // qDebug( "Debug: Retrieving file %s", file.name().latin1() ); 1160 // odebug << "Debug: Retrieving file " << file.name() << "" << oendl;
1157 break; 1161 break;
1158 case RetrieveGzipFile: 1162 case RetrieveGzipFile:
1159 qDebug("=-> starting tar process to receive .tgz file"); 1163 odebug << "=-> starting tar process to receive .tgz file" << oendl;
1160 break; 1164 break;
1161 case RetrieveBuffer: 1165 case RetrieveBuffer:
1162 // retrieve buffer mode 1166 // retrieve buffer mode
@@ -1165,17 +1169,17 @@ void ServerDTP::connected()
1165 mode = Idle; 1169 mode = Idle;
1166 return ; 1170 return ;
1167 } 1171 }
1168 // qDebug( "Debug: Retrieving byte array" ); 1172 // odebug << "Debug: Retrieving byte array" << oendl;
1169 break; 1173 break;
1170 case Idle: 1174 case Idle:
1171 qDebug("connection established but mode set to Idle; BUG!"); 1175 odebug << "connection established but mode set to Idle; BUG!" << oendl;
1172 break; 1176 break;
1173 } 1177 }
1174} 1178}
1175 1179
1176void ServerDTP::connectionClosed() 1180void ServerDTP::connectionClosed()
1177{ 1181{
1178 //qDebug( "Debug: Data connection closed %ld bytes written", bytes_written ); 1182 //odebug << "Debug: Data connection closed " << bytes_written << " bytes written" << oendl;
1179 1183
1180 // send file mode 1184 // send file mode
1181 if ( SendFile == mode ) { 1185 if ( SendFile == mode ) {
@@ -1200,7 +1204,7 @@ void ServerDTP::connectionClosed()
1200 } 1204 }
1201 1205
1202 else if ( RetrieveGzipFile == mode ) { 1206 else if ( RetrieveGzipFile == mode ) {
1203 qDebug("Done writing ungzip file; closing input"); 1207 odebug << "Done writing ungzip file; closing input" << oendl;
1204 gzipProc->flushStdin(); 1208 gzipProc->flushStdin();
1205 gzipProc->closeStdin(); 1209 gzipProc->closeStdin();
1206 } 1210 }
@@ -1222,7 +1226,7 @@ void ServerDTP::bytesWritten( int bytes )
1222 if ( SendFile == mode ) { 1226 if ( SendFile == mode ) {
1223 1227
1224 if ( bytes_written == file.size() ) { 1228 if ( bytes_written == file.size() ) {
1225 // qDebug( "Debug: Sending complete: %d bytes", file.size() ); 1229 // odebug << "Debug: Sending complete: " << file.size() << " bytes" << oendl;
1226 file.close(); 1230 file.close();
1227 emit completed(); 1231 emit completed();
1228 mode = Idle; 1232 mode = Idle;
@@ -1239,7 +1243,7 @@ void ServerDTP::bytesWritten( int bytes )
1239 if ( SendBuffer == mode ) { 1243 if ( SendBuffer == mode ) {
1240 1244
1241 if ( bytes_written == buf.size() ) { 1245 if ( bytes_written == buf.size() ) {
1242 // qDebug( "Debug: Sending complete: %d bytes", buf.size() ); 1246 // odebug << "Debug: Sending complete: " << buf.size() << " bytes" << oendl;
1243 emit completed(); 1247 emit completed();
1244 mode = Idle; 1248 mode = Idle;
1245 } 1249 }
@@ -1263,7 +1267,7 @@ void ServerDTP::readyRead()
1263 s.resize( bytesAvailable() ); 1267 s.resize( bytesAvailable() );
1264 readBlock( s.data(), bytesAvailable() ); 1268 readBlock( s.data(), bytesAvailable() );
1265 gzipProc->writeStdin( s.data(), s.size() ); 1269 gzipProc->writeStdin( s.data(), s.size() );
1266 qDebug("wrote %d bytes to ungzip ", s.size() ); 1270 odebug << "wrote " << s.size() << " bytes to ungzip " << oendl;
1267 } 1271 }
1268 // retrieve buffer mode 1272 // retrieve buffer mode
1269 else if ( RetrieveBuffer == mode ) { 1273 else if ( RetrieveBuffer == mode ) {
@@ -1277,9 +1281,9 @@ void ServerDTP::readyRead()
1277void ServerDTP::writeTargzBlock(Opie::Core::OProcess *, char *buffer, int buflen) 1281void ServerDTP::writeTargzBlock(Opie::Core::OProcess *, char *buffer, int buflen)
1278{ 1282{
1279 writeBlock( buffer, buflen ); 1283 writeBlock( buffer, buflen );
1280 qDebug("writeTargzBlock %d", buflen); 1284 odebug << "writeTargzBlock " << buflen << "" << oendl;
1281 if ( !createTargzProc->isRunning() ) { 1285 if ( !createTargzProc->isRunning() ) {
1282 qDebug("tar and gzip done"); 1286 odebug << "tar and gzip done" << oendl;
1283 emit completed(); 1287 emit completed();
1284 mode = Idle; 1288 mode = Idle;
1285 disconnect( gzipProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), 1289 disconnect( gzipProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
@@ -1289,7 +1293,7 @@ void ServerDTP::writeTargzBlock(Opie::Core::OProcess *, char *buffer, int buflen
1289 1293
1290void ServerDTP::targzDone() 1294void ServerDTP::targzDone()
1291{ 1295{
1292 //qDebug("targz done"); 1296 //odebug << "targz done" << oendl;
1293 disconnect( createTargzProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), 1297 disconnect( createTargzProc, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
1294 this, SLOT( gzipTarBlock(Opie::Core::OProcess*,char*,int) ) ); 1298 this, SLOT( gzipTarBlock(Opie::Core::OProcess*,char*,int) ) );
1295 gzipProc->closeStdin(); 1299 gzipProc->closeStdin();
@@ -1297,9 +1301,9 @@ void ServerDTP::targzDone()
1297 1301
1298void ServerDTP::gzipTarBlock(Opie::Core::OProcess *, char *buffer, int buflen) 1302void ServerDTP::gzipTarBlock(Opie::Core::OProcess *, char *buffer, int buflen)
1299{ 1303{
1300 //qDebug("gzipTarBlock"); 1304 //odebug << "gzipTarBlock" << oendl;
1301 if ( !gzipProc->isRunning() ) { 1305 if ( !gzipProc->isRunning() ) {
1302 //qDebug("auto start gzip proc"); 1306 //odebug << "auto start gzip proc" << oendl;
1303 gzipProc->start(Opie::Core::OProcess::NotifyOnExit, (Opie::Core::OProcess::Communication) ( Opie::Core::OProcess::Stdin | Opie::Core::OProcess::Stdout )); 1307 gzipProc->start(Opie::Core::OProcess::NotifyOnExit, (Opie::Core::OProcess::Communication) ( Opie::Core::OProcess::Stdin | Opie::Core::OProcess::Stdout ));
1304 } 1308 }
1305 gzipProc->writeStdin( buffer, buflen ); 1309 gzipProc->writeStdin( buffer, buflen );
@@ -1335,7 +1339,7 @@ void ServerDTP::sendGzipFile( const QString &fn,
1335 QStringList args = "tar"; 1339 QStringList args = "tar";
1336 args += "-cv"; 1340 args += "-cv";
1337 args += archiveTargets; 1341 args += archiveTargets;
1338 qDebug("sendGzipFile %s", args.join(" ").latin1() ); 1342 odebug << "sendGzipFile " << args.join(" ") << "" << oendl;
1339 createTargzProc->clearArguments( ); 1343 createTargzProc->clearArguments( );
1340 *createTargzProc << args; 1344 *createTargzProc << args;
1341 connect( createTargzProc, 1345 connect( createTargzProc,
@@ -1349,7 +1353,7 @@ void ServerDTP::sendGzipFile( const QString &fn,
1349 1353
1350void ServerDTP::gunzipDone() 1354void ServerDTP::gunzipDone()
1351{ 1355{
1352 qDebug("gunzipDone"); 1356 odebug << "gunzipDone" << oendl;
1353 disconnect( gzipProc, SIGNAL( processExited() ), 1357 disconnect( gzipProc, SIGNAL( processExited() ),
1354 this, SLOT( gunzipDone() ) ); 1358 this, SLOT( gunzipDone() ) );
1355 retrieveTargzProc->closeStdin(); 1359 retrieveTargzProc->closeStdin();
@@ -1359,11 +1363,11 @@ void ServerDTP::gunzipDone()
1359 1363
1360void ServerDTP::tarExtractBlock(Opie::Core::OProcess *, char *buffer, int buflen) 1364void ServerDTP::tarExtractBlock(Opie::Core::OProcess *, char *buffer, int buflen)
1361{ 1365{
1362 qDebug("tarExtractBlock"); 1366 odebug << "tarExtractBlock" << oendl;
1363 if ( !retrieveTargzProc->isRunning() ) { 1367 if ( !retrieveTargzProc->isRunning() ) {
1364 qDebug("auto start ungzip proc"); 1368 odebug << "auto start ungzip proc" << oendl;
1365 if ( !retrieveTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdin) ) 1369 if ( !retrieveTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdin) )
1366 qWarning(" failed to start tar -x process"); 1370 owarn << " failed to start tar -x process" << oendl;
1367 } 1371 }
1368 retrieveTargzProc->writeStdin( buffer, buflen ); 1372 retrieveTargzProc->writeStdin( buffer, buflen );
1369} 1373}
@@ -1384,7 +1388,7 @@ void ServerDTP::retrieveFile( const QString fn )
1384 1388
1385void ServerDTP::retrieveGzipFile( const QString &fn ) 1389void ServerDTP::retrieveGzipFile( const QString &fn )
1386{ 1390{
1387 qDebug("retrieveGzipFile %s", fn.latin1()); 1391 odebug << "retrieveGzipFile " << fn << "" << oendl;
1388 file.setName( fn ); 1392 file.setName( fn );
1389 mode = RetrieveGzipFile; 1393 mode = RetrieveGzipFile;
1390 1394