summaryrefslogtreecommitdiff
path: root/core/qws
Unidiff
Diffstat (limited to 'core/qws') (more/less context) (ignore whitespace changes)
-rw-r--r--core/qws/qcopbridge.cpp10
-rw-r--r--core/qws/transferserver.cpp32
2 files changed, 21 insertions, 21 deletions
diff --git a/core/qws/qcopbridge.cpp b/core/qws/qcopbridge.cpp
index c0c52e8..4fd0807 100644
--- a/core/qws/qcopbridge.cpp
+++ b/core/qws/qcopbridge.cpp
@@ -55,9 +55,9 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent ,
55#ifndef QT_NO_COP 55#ifndef QT_NO_COP
56 desktopChannel = new QCopChannel( "QPE/Desktop", this ); 56 desktopChannel = new QCopChannel( "QPE/Desktop", this );
57 connect( desktopChannel, SIGNAL(received(const QCString &, const QByteArray &)), 57 connect( desktopChannel, SIGNAL(received(const QCString&,const QByteArray&)),
58 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) ); 58 this, SLOT(desktopMessage(const QCString&,const QByteArray&)) );
59 cardChannel = new QCopChannel( "QPE/Card", this ); 59 cardChannel = new QCopChannel( "QPE/Card", this );
60 connect( cardChannel, SIGNAL(received(const QCString &, const QByteArray &)), 60 connect( cardChannel, SIGNAL(received(const QCString&,const QByteArray&)),
61 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) ); 61 this, SLOT(desktopMessage(const QCString&,const QByteArray&)) );
62#endif 62#endif
63 } 63 }
@@ -76,5 +76,5 @@ void QCopBridge::newConnection( int socket )
76 QCopBridgePI *pi = new QCopBridgePI( socket, this ); 76 QCopBridgePI *pi = new QCopBridgePI( socket, this );
77 openConnections.append( pi ); 77 openConnections.append( pi );
78 connect ( pi, SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( connectionClosed( QCopBridgePI *) ) ); 78 connect ( pi, SIGNAL( connectionClosed(QCopBridgePI*) ), this, SLOT( connectionClosed(QCopBridgePI*) ) );
79#ifndef QT_NO_COP 79#ifndef QT_NO_COP
80 QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend; 80 QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
diff --git a/core/qws/transferserver.cpp b/core/qws/transferserver.cpp
index 30bf438..daf63ec 100644
--- a/core/qws/transferserver.cpp
+++ b/core/qws/transferserver.cpp
@@ -295,5 +295,5 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name )
295 connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) ); 295 connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
296 connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) ); 296 connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
297 connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) ); 297 connect( dtp, SIGNAL( error(int) ), SLOT( dtpError(int) ) );
298 298
299 299
@@ -306,6 +306,6 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name )
306 serversocket = new ServerSocket( ++p, this ); 306 serversocket = new ServerSocket( ++p, this );
307 } 307 }
308 connect( serversocket, SIGNAL( newIncomming( int ) ), 308 connect( serversocket, SIGNAL( newIncomming(int) ),
309 SLOT( newConnection( int ) ) ); 309 SLOT( newConnection(int) ) );
310 } 310 }
311} 311}
@@ -1047,5 +1047,5 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
1047 connect( this, SIGNAL( connected() ), SLOT( connected() ) ); 1047 connect( this, SIGNAL( connected() ), SLOT( connected() ) );
1048 connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) ); 1048 connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
1049 connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) ); 1049 connect( this, SIGNAL( bytesWritten(int) ), SLOT( bytesWritten(int) ) );
1050 connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) ); 1050 connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) );
1051 1051
@@ -1054,5 +1054,5 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
1054 createTargzProc = new OProcess( QString("tar"), this, "createTargzProc"); 1054 createTargzProc = new OProcess( QString("tar"), this, "createTargzProc");
1055 createTargzProc->setWorkingDirectory( QDir::rootDirPath() ); 1055 createTargzProc->setWorkingDirectory( QDir::rootDirPath() );
1056 connect( createTargzProc, SIGNAL( processExited(OProcess *) ), SLOT( targzDone() ) ); 1056 connect( createTargzProc, SIGNAL( processExited(OProcess*) ), SLOT( targzDone() ) );
1057 1057
1058 QStringList args = "tar"; 1058 QStringList args = "tar";
@@ -1060,7 +1060,7 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
1060 retrieveTargzProc = new OProcess( args, this, "retrieveTargzProc" ); 1060 retrieveTargzProc = new OProcess( args, this, "retrieveTargzProc" );
1061 retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() ); 1061 retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() );
1062 connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ), 1062 connect( retrieveTargzProc, SIGNAL( processExited(OProcess*) ),
1063 SIGNAL( completed() ) ); 1063 SIGNAL( completed() ) );
1064 connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ), 1064 connect( retrieveTargzProc, SIGNAL( processExited(OProcess*) ),
1065 SLOT( extractTarDone() ) ); 1065 SLOT( extractTarDone() ) );
1066} 1066}
@@ -1282,6 +1282,6 @@ void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen)
1282 emit completed(); 1282 emit completed();
1283 mode = Idle; 1283 mode = Idle;
1284 disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int ) ), 1284 disconnect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ),
1285 this, SLOT( writeTargzBlock(OProcess *, char *, int) ) ); 1285 this, SLOT( writeTargzBlock(OProcess*,char*,int) ) );
1286 } 1286 }
1287} 1287}
@@ -1290,6 +1290,6 @@ void ServerDTP::targzDone()
1290{ 1290{
1291 //qDebug("targz done"); 1291 //qDebug("targz done");
1292 disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess *, char *, int) ), 1292 disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess*,char*,int) ),
1293 this, SLOT( gzipTarBlock(OProcess *, char *, int) ) ); 1293 this, SLOT( gzipTarBlock(OProcess*,char*,int) ) );
1294 gzipProc->closeStdin(); 1294 gzipProc->closeStdin();
1295} 1295}
@@ -1339,10 +1339,10 @@ void ServerDTP::sendGzipFile( const QString &fn,
1339 *createTargzProc << args; 1339 *createTargzProc << args;
1340 connect( createTargzProc, 1340 connect( createTargzProc,
1341 SIGNAL( receivedStdout(OProcess *, char *, int) ), SLOT( gzipTarBlock(OProcess *, char *, int) ) ); 1341 SIGNAL( receivedStdout(OProcess*,char*,int) ), SLOT( gzipTarBlock(OProcess*,char*,int) ) );
1342 1342
1343 gzipProc->clearArguments( ); 1343 gzipProc->clearArguments( );
1344 *gzipProc << "gzip"; 1344 *gzipProc << "gzip";
1345 connect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ), 1345 connect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ),
1346 SLOT( writeTargzBlock(OProcess *, char *, int) ) ); 1346 SLOT( writeTargzBlock(OProcess*,char*,int) ) );
1347} 1347}
1348 1348
@@ -1353,6 +1353,6 @@ void ServerDTP::gunzipDone()
1353 this, SLOT( gunzipDone() ) ); 1353 this, SLOT( gunzipDone() ) );
1354 retrieveTargzProc->closeStdin(); 1354 retrieveTargzProc->closeStdin();
1355 disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ), 1355 disconnect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ),
1356 this, SLOT( tarExtractBlock(OProcess *, char *, int) ) ); 1356 this, SLOT( tarExtractBlock(OProcess*,char*,int) ) );
1357} 1357}
1358 1358