author | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
commit | d69b11f67e3118f86d068c38c422984d754e13cc (patch) (unidiff) | |
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 @@ | |||
2 | boolean "libopieobex0 (library needed for beaming in Opie)" | 2 | boolean "libopieobex0 (library needed for beaming in Opie)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | 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 @@ | |||
3 | 3 | ||
4 | 4 | ||
5 | #include <opie/oprocess.h> | 5 | #include <opie2/oprocess.h> |
6 | #include "obex.h" | 6 | #include "obex.h" |
7 | 7 | ||
8 | using namespace OpieObex; | 8 | using namespace OpieObex; |
9 | 9 | ||
10 | using namespace Opie::Core; | ||
10 | /* TRANSLATOR OpieObex::Obex */ | 11 | /* TRANSLATOR OpieObex::Obex */ |
11 | 12 | ||
@@ -33,9 +34,9 @@ void Obex::receive() { | |||
33 | *m_rec << "irobex_palm3"; | 34 | *m_rec << "irobex_palm3"; |
34 | // connect to the necessary slots | 35 | // connect to the necessary slots |
35 | connect(m_rec, SIGNAL(processExited(OProcess*) ), | 36 | connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ), |
36 | this, SLOT(slotExited(OProcess*) ) ); | 37 | this, SLOT(slotExited(Opie::Core::OProcess*) ) ); |
37 | 38 | ||
38 | connect(m_rec, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | 39 | connect(m_rec, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
39 | this, SLOT(slotStdOut(OProcess*, char*, int) ) ); | 40 | this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); |
40 | 41 | ||
41 | if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 42 | if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
@@ -81,8 +82,8 @@ void Obex::sendNow(){ | |||
81 | 82 | ||
82 | // connect to slots Exited and and StdOut | 83 | // connect to slots Exited and and StdOut |
83 | connect(m_send, SIGNAL(processExited(OProcess*) ), | 84 | connect(m_send, SIGNAL(processExited(Opie::Core::OProcess*) ), |
84 | this, SLOT(slotExited(OProcess*)) ); | 85 | this, SLOT(slotExited(Opie::Core::OProcess*)) ); |
85 | connect(m_send, SIGNAL(receivedStdout(OProcess*, char*, int )), | 86 | connect(m_send, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int )), |
86 | this, SLOT(slotStdOut(OProcess*, char*, int) ) ); | 87 | this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); |
87 | 88 | ||
88 | // now start it | 89 | // 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 @@ | |||
6 | #include <qobject.h> | 6 | #include <qobject.h> |
7 | 7 | ||
8 | class OProcess; | 8 | namespace Opie {namespace Core {class OProcess;}} |
9 | class QCopChannel; | 9 | class QCopChannel; |
10 | namespace OpieObex { | 10 | namespace OpieObex { |
@@ -54,6 +54,6 @@ namespace OpieObex { | |||
54 | QString m_file; | 54 | QString m_file; |
55 | QString m_outp; | 55 | QString m_outp; |
56 | OProcess *m_send; | 56 | Opie::Core::OProcess *m_send; |
57 | OProcess *m_rec; | 57 | Opie::Core::OProcess *m_rec; |
58 | bool m_receive : 1; | 58 | bool m_receive : 1; |
59 | void shutDownReceive(); | 59 | void shutDownReceive(); |
@@ -68,6 +68,6 @@ private slots: | |||
68 | 68 | ||
69 | // the process exited | 69 | // the process exited |
70 | void slotExited(OProcess* proc) ; | 70 | void slotExited(Opie::Core::OProcess* proc) ; |
71 | void slotStdOut(OProcess*, char*, int); | 71 | void slotStdOut(Opie::Core::OProcess*, char*, int); |
72 | void slotError(); | 72 | void slotError(); |
73 | 73 | ||
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 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= obex.h obexhandler.h obexsend.h receiver.h | 3 | HEADERS= obex.h obexhandler.h obexsend.h receiver.h obeximpl.h |
4 | SOURCES= obex.cc obexsend.cpp obexhandler.cpp receiver.cpp | 4 | SOURCES= obex.cc obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp |
5 | TARGET = opieobex | 5 | TARGET = opieobex |
6 | DESTDIR = $(OPIEDIR)/plugins/obex | 6 | 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 @@ | |||
2 | #include "obeximpl.h" | 2 | #include "obeximpl.h" |
3 | 3 | ||
4 | |||
5 | |||
4 | using namespace OpieObex; | 6 | using namespace OpieObex; |
5 | 7 | ||