-rw-r--r-- | core/obex/obex.cc | 19 |
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,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 ); |