-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 | |||
@@ -3,2 +3,2 @@ | |||
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 | |||
@@ -4,3 +4,3 @@ | |||
4 | 4 | ||
5 | #include <opie/oprocess.h> | 5 | #include <opie2/oprocess.h> |
6 | #include "obex.h" | 6 | #include "obex.h" |
@@ -9,2 +9,3 @@ using namespace OpieObex; | |||
9 | 9 | ||
10 | using namespace Opie::Core; | ||
10 | /* TRANSLATOR OpieObex::Obex */ | 11 | /* TRANSLATOR OpieObex::Obex */ |
@@ -34,7 +35,7 @@ void Obex::receive() { | |||
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 | ||
@@ -82,6 +83,6 @@ void Obex::sendNow(){ | |||
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 | ||
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 | |||
@@ -7,3 +7,3 @@ | |||
7 | 7 | ||
8 | class OProcess; | 8 | namespace Opie {namespace Core {class OProcess;}} |
9 | class QCopChannel; | 9 | class QCopChannel; |
@@ -55,4 +55,4 @@ namespace OpieObex { | |||
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; |
@@ -69,4 +69,4 @@ private slots: | |||
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(); |
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 | |||
@@ -2,4 +2,4 @@ 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 |
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 | |||
@@ -3,2 +3,4 @@ | |||
3 | 3 | ||
4 | |||
5 | |||
4 | using namespace OpieObex; | 6 | using namespace OpieObex; |