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
@@ -29,7 +29,7 @@
 #include <qpe/custom.h>
 #endif
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 
 
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
@@ -23,7 +23,7 @@
 
 
 #include <qpe/qpeapplication.h>
-#include <opie/odevicebutton.h>
+#include <opie2/odevicebutton.h>
 
 #include <qwidget.h>
 #include <qdatetime.h>
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
@@ -14,7 +14,7 @@ SOURCES		= \
 
         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
@@ -64,7 +64,8 @@ extern "C"
 #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;
 
@@ -1049,19 +1050,19 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
         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() ) );
 }
 
@@ -1121,7 +1122,7 @@ void ServerDTP::connected()
 
                         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());
@@ -1256,7 +1257,7 @@ void ServerDTP::readyRead()
         }
         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() );
@@ -1273,7 +1274,7 @@ void ServerDTP::readyRead()
         }
 }
 
-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);
@@ -1281,25 +1282,25 @@ void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen)
                 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 );
 }
@@ -1338,12 +1339,12 @@ void ServerDTP::sendGzipFile( const QString &fn,
         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()
@@ -1352,16 +1353,16 @@ void ServerDTP::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 );
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
@@ -24,7 +24,8 @@
 #include <qbuffer.h>
 
 class QFileInfo;
-class OProcess;
+namespace Opie { namespace Core { class OProcess; } }
+
 class TransferServer : public QServerSocket
 {
     Q_OBJECT
@@ -92,11 +93,11 @@ private slots:
     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();
 
@@ -106,9 +107,9 @@ private:
     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