author | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
commit | d69b11f67e3118f86d068c38c422984d754e13cc (patch) (side-by-side diff) | |
tree | 9733e26ab49003bead06d820d70a14babd0c09f0 /core/obex | |
parent | 64820b76cc9d1c06a6967cd34114f3b95896aaeb (diff) | |
download | opie-d69b11f67e3118f86d068c38c422984d754e13cc.zip opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.gz opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.bz2 |
Updatet the applets
-rw-r--r-- | core/obex/config.in | 2 | ||||
-rw-r--r-- | core/obex/obex.cc | 19 | ||||
-rw-r--r-- | core/obex/obex.h | 10 | ||||
-rw-r--r-- | core/obex/obex.pro | 4 | ||||
-rw-r--r-- | core/obex/obeximpl.cpp | 2 |
5 files changed, 20 insertions, 17 deletions
diff --git a/core/obex/config.in b/core/obex/config.in index ef09f7a..c0208d1 100644 --- a/core/obex/config.in +++ b/core/obex/config.in @@ -2,3 +2,3 @@ boolean "libopieobex0 (library needed for beaming in Opie)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 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 @@ -3,9 +3,10 @@ -#include <opie/oprocess.h> +#include <opie2/oprocess.h> #include "obex.h" using namespace OpieObex; +using namespace Opie::Core; /* TRANSLATOR OpieObex::Obex */ @@ -33,9 +34,9 @@ void Obex::receive() { *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) ) { @@ -81,8 +82,8 @@ void Obex::sendNow(){ // 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 diff --git a/core/obex/obex.h b/core/obex/obex.h index 60f5d28..284cb12 100644 --- a/core/obex/obex.h +++ b/core/obex/obex.h @@ -6,5 +6,5 @@ #include <qobject.h> -class OProcess; +namespace Opie {namespace Core {class OProcess;}} class QCopChannel; namespace OpieObex { @@ -54,6 +54,6 @@ namespace OpieObex { QString m_file; QString m_outp; - OProcess *m_send; - OProcess *m_rec; + Opie::Core::OProcess *m_send; + Opie::Core::OProcess *m_rec; bool m_receive : 1; void shutDownReceive(); @@ -68,6 +68,6 @@ private slots: // the process exited - void slotExited(OProcess* proc) ; - void slotStdOut(OProcess*, char*, int); + void slotExited(Opie::Core::OProcess* proc) ; + void slotStdOut(Opie::Core::OProcess*, char*, int); void slotError(); diff --git a/core/obex/obex.pro b/core/obex/obex.pro index a296b2c..51fa300 100644 --- a/core/obex/obex.pro +++ b/core/obex/obex.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt warn_on release -HEADERS = obex.h obexhandler.h obexsend.h receiver.h -SOURCES = obex.cc obexsend.cpp obexhandler.cpp receiver.cpp +HEADERS = obex.h obexhandler.h obexsend.h receiver.h obeximpl.h +SOURCES = obex.cc obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp TARGET = opieobex DESTDIR = $(OPIEDIR)/plugins/obex diff --git a/core/obex/obeximpl.cpp b/core/obex/obeximpl.cpp index 5b53644..ca6ce7b 100644 --- a/core/obex/obeximpl.cpp +++ b/core/obex/obeximpl.cpp @@ -2,4 +2,6 @@ #include "obeximpl.h" + + using namespace OpieObex; |