author | mickeyl <mickeyl> | 2004-03-24 00:20:42 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-24 00:20:42 (UTC) |
commit | cc2fd242ec29023784748e6c9d662cb1f89e83ec (patch) (side-by-side diff) | |
tree | 55fa7676f1c64607e9a9327c2b206dd3a95625a4 /core/qws | |
parent | f08adf125dbaa2a411fad9fba22443c7364afca3 (diff) | |
download | opie-cc2fd242ec29023784748e6c9d662cb1f89e83ec.zip opie-cc2fd242ec29023784748e6c9d662cb1f89e83ec.tar.gz opie-cc2fd242ec29023784748e6c9d662cb1f89e83ec.tar.bz2 |
convert to libopie2
-rw-r--r-- | core/qws/config.in | 13 | ||||
-rw-r--r-- | core/qws/oqwsserver.cpp | 2 | ||||
-rw-r--r-- | core/qws/oqwsserver.h | 2 | ||||
-rw-r--r-- | core/qws/qws.pro | 4 | ||||
-rw-r--r-- | core/qws/transferserver.cpp | 47 | ||||
-rw-r--r-- | core/qws/transferserver.h | 15 |
6 files changed, 37 insertions, 46 deletions
diff --git a/core/qws/config.in b/core/qws/config.in index 3706405..903eaa1 100644 --- a/core/qws/config.in +++ b/core/qws/config.in @@ -1,16 +1,5 @@ config QWS boolean "Minimal QWS Server" default "n" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && EXPERIMENTAL + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && EXPERIMENTAL -# menu "Advanced QWS Server Config" -# config QWS_QCOP -# bool "QCop bridge and Transfer server (sync)" -# default y -# depends on QWS -# -# config QWS_PACKAGE -# bool "Package Slave (package installs via sync software)" -# default n -# depends on QWS -# endmenu diff --git a/core/qws/oqwsserver.cpp b/core/qws/oqwsserver.cpp index 907686a..d6b6504 100644 --- a/core/qws/oqwsserver.cpp +++ b/core/qws/oqwsserver.cpp @@ -20,25 +20,25 @@ #include <syslog.h> #include "oqwsserver.h" #include "qcopbridge.h" #include "transferserver.h" #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) #include <qpe/custom.h> #endif -#include <opie/odevice.h> +#include <opie2/odevice.h> #include <stdlib.h> #include <unistd.h> #include <fcntl.h> using namespace Opie; OQWSServer::OQWSServer( int& argc, char **argv, Type appType ) : QPEApplication( argc, argv, appType ) { diff --git a/core/qws/oqwsserver.h b/core/qws/oqwsserver.h index b95c3fb..c8622d4 100644 --- a/core/qws/oqwsserver.h +++ b/core/qws/oqwsserver.h @@ -14,25 +14,25 @@ ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #ifndef __DESKTOP_H__ #define __DESKTOP_H__ #include <qpe/qpeapplication.h> -#include <opie/odevicebutton.h> +#include <opie2/odevicebutton.h> #include <qwidget.h> #include <qdatetime.h> class QCopBridge; class TransferServer; class OQWSServer : public QPEApplication { Q_OBJECT public: OQWSServer( int& argc, char **argv, Type t ); diff --git a/core/qws/qws.pro b/core/qws/qws.pro index 5656a59..50d0b2b 100644 --- a/core/qws/qws.pro +++ b/core/qws/qws.pro @@ -5,16 +5,16 @@ DESTDIR = $(OPIEDIR)/bin HEADERS = \ transferserver.h \ qcopbridge.h \ oqwsserver.h SOURCES = \ main.cpp \ transferserver.cpp \ qcopbridge.cpp \ oqwsserver.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include . -TARGET = op-qws -LIBS += -lqpe -lopie +TARGET = qws +LIBS += -lqpe -lopiecore2 -lopieui2 include ( $(OPIEDIR)/include.pro ) 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 @@ -55,25 +55,26 @@ extern "C" #include <qtextstream.h> #include <qmessagebox.h> //#include <qpe/qcopchannel_qws.h> #include <qpe/process.h> #include <qpe/global.h> #include <qpe/config.h> #include <qpe/contact.h> #include <qpe/version.h> #include <qpe/qcopenvelope_qws.h> #include "transferserver.h" -#include <opie/oprocess.h> +#include <opie2/oprocess.h> +using namespace Opie::Core; const int block_size = 51200; TransferServer::TransferServer( Q_UINT16 port, QObject *parent , const char* name ) : QServerSocket( port, 1, parent, name ) { if ( !ok() ) qWarning( "Failed to bind to port %d", port ); } TransferServer::~TransferServer() @@ -1040,37 +1041,37 @@ void ServerPI::timerEvent( QTimerEvent * ) ServerDTP::ServerDTP( QObject *parent, const char* name) : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ), retrieveTargzProc( 0 ), gzipProc( 0 ) { connect( this, SIGNAL( connected() ), SLOT( connected() ) ); connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) ); connect( this, SIGNAL( bytesWritten(int) ), SLOT( bytesWritten(int) ) ); connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) ); - 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() ) ); QStringList args = "tar"; 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() ) ); } ServerDTP::~ServerDTP() { buf.close(); file.close(); createTargzProc->kill(); } void ServerDTP::extractTarDone() { @@ -1112,25 +1113,25 @@ void ServerDTP::connected() } } break; case SendGzipFile: if ( createTargzProc->isRunning() ) { // SHOULDN'T GET HERE, BUT DOING A SAFETY CHECK ANYWAY qWarning("Previous tar --gzip process is still running; killing it..."); createTargzProc->kill(); } bytes_written = 0; 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", createTargzProc->args()[0].data(), gzipProc->args()[0].data()); break; case SendBuffer: if ( !buf.open( IO_ReadOnly) ) { emit failed(); mode = Idle; return ; } // qDebug( "Debug: Sending byte array" ); @@ -1247,68 +1248,68 @@ void ServerDTP::bytesWritten( int bytes ) void ServerDTP::readyRead() { // retrieve file mode if ( RetrieveFile == mode ) { QCString s; s.resize( bytesAvailable() ); readBlock( s.data(), bytesAvailable() ); file.writeBlock( s.data(), s.size() ); } else if ( RetrieveGzipFile == mode ) { 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 )); QByteArray s; s.resize( bytesAvailable() ); readBlock( s.data(), bytesAvailable() ); gzipProc->writeStdin( s.data(), s.size() ); qDebug("wrote %d bytes to ungzip ", s.size() ); } // retrieve buffer mode else if ( RetrieveBuffer == mode ) { QCString s; s.resize( bytesAvailable() ); readBlock( s.data(), bytesAvailable() ); buf.writeBlock( s.data(), s.size() ); } } -void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen) +void ServerDTP::writeTargzBlock(Opie::Core::OProcess *, char *buffer, int buflen) { writeBlock( buffer, buflen ); qDebug("writeTargzBlock %d", buflen); if ( !createTargzProc->isRunning() ) { qDebug("tar and gzip done"); emit completed(); 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) ) ); } } 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(); } -void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen) +void ServerDTP::gzipTarBlock(Opie::Core::OProcess *, char *buffer, int buflen) { //qDebug("gzipTarBlock"); if ( !gzipProc->isRunning() ) { //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 )); } gzipProc->writeStdin( buffer, buflen ); } void ServerDTP::sendFile( const QString fn, const QHostAddress& host, Q_UINT16 port ) { file.setName( fn ); mode = SendFile; connectToHost( host.toString(), port ); } void ServerDTP::sendFile( const QString fn ) @@ -1329,48 +1330,48 @@ void ServerDTP::sendGzipFile( const QString &fn, const QStringList &archiveTargets ) { mode = SendGzipFile; file.setName( fn ); QStringList args = "tar"; args += "-cv"; args += archiveTargets; qDebug("sendGzipFile %s", args.join(" ").latin1() ); createTargzProc->clearArguments( ); *createTargzProc << args; 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) ) ); gzipProc->clearArguments( ); *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) ) ); } void ServerDTP::gunzipDone() { qDebug("gunzipDone"); disconnect( gzipProc, SIGNAL( processExited() ), this, SLOT( 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) { qDebug("tarExtractBlock"); if ( !retrieveTargzProc->isRunning() ) { 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"); } retrieveTargzProc->writeStdin( buffer, buflen ); } void ServerDTP::retrieveFile( const QString fn, const QHostAddress& host, Q_UINT16 port ) { file.setName( fn ); mode = RetrieveFile; connectToHost( host.toString(), port ); } diff --git a/core/qws/transferserver.h b/core/qws/transferserver.h index 1c5ab4b..82dae40 100644 --- a/core/qws/transferserver.h +++ b/core/qws/transferserver.h @@ -15,25 +15,26 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include <qserversocket.h> #include <qsocket.h> #include <qdir.h> #include <qfile.h> #include <qbuffer.h> class QFileInfo; -class OProcess; +namespace Opie { namespace Core { class OProcess; } } + class TransferServer : public QServerSocket { Q_OBJECT public: TransferServer( Q_UINT16 port, QObject *parent = 0, const char* name = 0 ); virtual ~TransferServer(); void newConnection( int socket ); }; class SyncAuthentication : QObject @@ -83,41 +84,41 @@ public: void setSocket( int socket ); signals: void completed(); void failed(); private slots: void connectionClosed(); void connected(); void bytesWritten( int bytes ); void readyRead(); - void writeTargzBlock(OProcess *, char *, int); + void writeTargzBlock(Opie::Core::OProcess *, char *, int); void targzDone(); - void gzipTarBlock(OProcess *, char *, int); - void tarExtractBlock(OProcess *, char *, int); + void gzipTarBlock(Opie::Core::OProcess *, char *, int); + void tarExtractBlock(Opie::Core::OProcess *, char *, int); void gunzipDone(); void extractTarDone(); private: unsigned long bytes_written; Mode mode; QFile file; QBuffer buf; - OProcess *createTargzProc; - OProcess *retrieveTargzProc; - OProcess *gzipProc; + Opie::Core::OProcess *createTargzProc; + Opie::Core::OProcess *retrieveTargzProc; + Opie::Core::OProcess *gzipProc; }; class ServerSocket : public QServerSocket { Q_OBJECT public: ServerSocket( Q_UINT16 port, QObject *parent = 0, const char* name = 0 ) : QServerSocket( port, 1, parent, name ) {} void newConnection( int socket ) { emit newIncomming( socket ); } signals: |