1 files changed, 10 insertions, 9 deletions

diff --git a/core/obex/obex.cc b/core/obex/obex.cc
index 50e5201..3c99af6 100644
--- a/core/obex/obex.cc
+++ b/core/obex/obex.cc
@@ -1,110 +1,111 @@
 
 #include <qfileinfo.h>
 
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 #include "obex.h"
 
 using namespace  OpieObex;
 
+using namespace Opie::Core;
 /* TRANSLATOR OpieObex::Obex */
 
 Obex::Obex( QObject *parent, const char* name )
   : QObject(parent, name )
 {
     m_rec = 0;
     m_send=0;
     m_count = 0;
     m_receive = false;
     connect( this, SIGNAL(error(int) ), // for recovering to receive
              SLOT(slotError() ) );
     connect( this, SIGNAL(sent(bool) ),
              SLOT(slotError() ) );
 };
 Obex::~Obex() {
     delete m_rec;
     delete m_send;
 }
 void Obex::receive()  {
     m_receive = true;
     m_outp = QString::null;
     qWarning("Receive" );
     m_rec = new OProcess();
     *m_rec << "irobex_palm3";
     // connect to the necessary slots
-    connect(m_rec,  SIGNAL(processExited(OProcess*) ),
-            this,  SLOT(slotExited(OProcess*) ) );
+    connect(m_rec,  SIGNAL(processExited(Opie::Core::OProcess*) ),
+            this,  SLOT(slotExited(Opie::Core::OProcess*) ) );
 
-    connect(m_rec,  SIGNAL(receivedStdout(OProcess*, char*,  int ) ),
-            this,  SLOT(slotStdOut(OProcess*, char*, int) ) );
+    connect(m_rec,  SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
+            this,  SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
 
     if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning("could not start :(");
         emit done( false );
         delete m_rec;
         m_rec = 0;
     }
 //    emit currentTry(m_count );
 
 }
 void Obex::send( const QString& fileName) { // if currently receiving stop it send receive
     m_count = 0;
     m_file = fileName;
     qWarning("send %s", fileName.latin1() );
     if (m_rec != 0 ) {
         qWarning("running");
         if (m_rec->isRunning() ) {
             emit error(-1 );
             qWarning("is running");
             delete m_rec;
             m_rec = 0;
 
         }else{
             qWarning("is not running");
             emit error( -1 ); // we did not delete yet but it's not running slotExited is pending
             return;
         }
     }
     sendNow();
 }
 void Obex::sendNow(){
     qWarning("sendNow");
     if ( m_count >= 25 ) { // could not send
         emit error(-1 );
         emit sent(false);
         return;
     }
     // OProcess inititialisation
     m_send = new OProcess();
     *m_send << "irobex_palm3";
     *m_send << QFile::encodeName(m_file);
 
     // connect to slots Exited and and StdOut
-    connect(m_send,  SIGNAL(processExited(OProcess*) ),
-            this, SLOT(slotExited(OProcess*)) );
-    connect(m_send,  SIGNAL(receivedStdout(OProcess*, char*,  int )),
-            this, SLOT(slotStdOut(OProcess*, char*, int) ) );
+    connect(m_send,  SIGNAL(processExited(Opie::Core::OProcess*) ),
+            this, SLOT(slotExited(Opie::Core::OProcess*)) );
+    connect(m_send,  SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int )),
+            this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
 
     // now start it
     if (!m_send->start(/*OProcess::NotifyOnExit,  OProcess::AllOutput*/ ) ) {
         qWarning("could not send" );
         m_count = 25;
         emit error(-1 );
         delete m_send;
         m_send=0;
     }
     // end
     m_count++;
     emit currentTry( m_count );
 }
 
 void Obex::slotExited(OProcess* proc ){
     if (proc == m_rec ) { // receive process
         received();
     }else if ( proc == m_send ) {
         sendEnd();
     }
 }
 void Obex::slotStdOut(OProcess* proc, char* buf, int len){
     if ( proc == m_rec ) { // only receive
         QByteArray ar( len  );