-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 | |||
@@ -1,4 +1,4 @@ | |||
1 | config OBEX | 1 | config OBEX |
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 | |||
@@ -1,15 +1,16 @@ | |||
1 | 1 | ||
2 | #include <qfileinfo.h> | 2 | #include <qfileinfo.h> |
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 | ||
12 | Obex::Obex( QObject *parent, const char* name ) | 13 | Obex::Obex( QObject *parent, const char* name ) |
13 | : QObject(parent, name ) | 14 | : QObject(parent, name ) |
14 | { | 15 | { |
15 | m_rec = 0; | 16 | m_rec = 0; |
@@ -29,17 +30,17 @@ void Obex::receive() { | |||
29 | m_receive = true; | 30 | m_receive = true; |
30 | m_outp = QString::null; | 31 | m_outp = QString::null; |
31 | qWarning("Receive" ); | 32 | qWarning("Receive" ); |
32 | m_rec = new OProcess(); | 33 | m_rec = new OProcess(); |
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) ) { |
42 | qWarning("could not start :("); | 43 | qWarning("could not start :("); |
43 | emit done( false ); | 44 | emit done( false ); |
44 | delete m_rec; | 45 | delete m_rec; |
45 | m_rec = 0; | 46 | m_rec = 0; |
@@ -77,16 +78,16 @@ void Obex::sendNow(){ | |||
77 | // OProcess inititialisation | 78 | // OProcess inititialisation |
78 | m_send = new OProcess(); | 79 | m_send = new OProcess(); |
79 | *m_send << "irobex_palm3"; | 80 | *m_send << "irobex_palm3"; |
80 | *m_send << QFile::encodeName(m_file); | 81 | *m_send << QFile::encodeName(m_file); |
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 |
89 | if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) { | 90 | if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) { |
90 | qWarning("could not send" ); | 91 | qWarning("could not send" ); |
91 | m_count = 25; | 92 | m_count = 25; |
92 | emit error(-1 ); | 93 | emit error(-1 ); |
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 | |||
@@ -2,13 +2,13 @@ | |||
2 | 2 | ||
3 | #ifndef OpieObex_H | 3 | #ifndef OpieObex_H |
4 | #define OpieObex_H | 4 | #define OpieObex_H |
5 | 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 { |
11 | class Obex : public QObject { | 11 | class Obex : public QObject { |
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | public: | 13 | public: |
14 | /** | 14 | /** |
@@ -50,28 +50,28 @@ namespace OpieObex { | |||
50 | void done(bool); | 50 | void done(bool); |
51 | 51 | ||
52 | private: | 52 | private: |
53 | uint m_count; | 53 | uint m_count; |
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(); |
60 | 60 | ||
61 | private slots: | 61 | private slots: |
62 | 62 | ||
63 | /** | 63 | /** |
64 | * send over palm obex | 64 | * send over palm obex |
65 | */ | 65 | */ |
66 | 66 | ||
67 | //void send(const QString&); | 67 | //void send(const QString&); |
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 | ||
74 | private: | 74 | private: |
75 | void sendNow(); | 75 | void sendNow(); |
76 | QString parseOut(); | 76 | QString parseOut(); |
77 | void received(); | 77 | void received(); |
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,10 +1,10 @@ | |||
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 |
7 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher | 7 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe -lopiecore2 | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 0.0.2 | 10 | VERSION = 0.0.2 |
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 | |||
@@ -1,9 +1,11 @@ | |||
1 | #include "obexhandler.h" | 1 | #include "obexhandler.h" |
2 | #include "obeximpl.h" | 2 | #include "obeximpl.h" |
3 | 3 | ||
4 | |||
5 | |||
4 | using namespace OpieObex; | 6 | using namespace OpieObex; |
5 | 7 | ||
6 | /* TRANSLATOR OpieObex::ObexImpl */ | 8 | /* TRANSLATOR OpieObex::ObexImpl */ |
7 | 9 | ||
8 | ObexImpl::ObexImpl() { | 10 | ObexImpl::ObexImpl() { |
9 | m_handler = new ObexHandler; | 11 | m_handler = new ObexHandler; |