-rw-r--r-- | core/obex/obexhandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp index 5aaf63c..c237555 100644 --- a/core/obex/obexhandler.cpp +++ b/core/obex/obexhandler.cpp | |||
@@ -1,67 +1,68 @@ | |||
1 | #include <qcopchannel_qws.h> | 1 | #include <qcopchannel_qws.h> |
2 | 2 | ||
3 | #include <qpe/qcopenvelope_qws.h> | 3 | #include <qpe/qcopenvelope_qws.h> |
4 | #include <qpe/qpeapplication.h> | ||
4 | 5 | ||
5 | #include "obexsend.h" | 6 | #include "obexsend.h" |
6 | #include "receiver.h" | 7 | #include "receiver.h" |
7 | #include "obexhandler.h" | 8 | #include "obexhandler.h" |
8 | 9 | ||
9 | using namespace OpieObex; | 10 | using namespace OpieObex; |
10 | 11 | ||
11 | /* TRANSLATOR OpieObex::ObexHandler */ | 12 | /* TRANSLATOR OpieObex::ObexHandler */ |
12 | 13 | ||
13 | ObexHandler::ObexHandler() { | 14 | ObexHandler::ObexHandler() { |
14 | m_wasRec = false; | 15 | m_wasRec = false; |
15 | m_sender = 0l; | 16 | m_sender = 0l; |
16 | m_receiver = 0l; | 17 | m_receiver = 0l; |
17 | QCopChannel* chan = new QCopChannel("QPE/Obex"); | 18 | QCopChannel* chan = new QCopChannel("QPE/Obex"); |
18 | connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ), | 19 | connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ), |
19 | this, SLOT(irdaMessage(const QCString&, const QByteArray& ) ) ); | 20 | this, SLOT(irdaMessage(const QCString&, const QByteArray& ) ) ); |
20 | } | 21 | } |
21 | ObexHandler::~ObexHandler() { | 22 | ObexHandler::~ObexHandler() { |
22 | delete m_sender; | 23 | delete m_sender; |
23 | delete m_receiver; | 24 | delete m_receiver; |
24 | } | 25 | } |
25 | void ObexHandler::doSend(const QString& str, const QString& desc) { | 26 | void ObexHandler::doSend(const QString& str, const QString& desc) { |
26 | delete m_sender; | 27 | delete m_sender; |
27 | m_sender = new SendWidget; | 28 | m_sender = new SendWidget; |
28 | m_sender->raise(); | 29 | m_sender->raise(); |
29 | m_sender->showMaximized(); | 30 | QPEApplication::showWidget( m_sender ); |
30 | connect(m_sender, SIGNAL(done() ), | 31 | connect(m_sender, SIGNAL(done() ), |
31 | this, SLOT(slotSent() ) ); | 32 | this, SLOT(slotSent() ) ); |
32 | m_sender->send( str, desc ); | 33 | m_sender->send( str, desc ); |
33 | } | 34 | } |
34 | void ObexHandler::doReceive(bool b) { | 35 | void ObexHandler::doReceive(bool b) { |
35 | if (m_receiver && b ) return; // we should enable receiver and it is on | 36 | if (m_receiver && b ) return; // we should enable receiver and it is on |
36 | else if (!m_receiver && !b ) return; // we should disbale receiver and it is off | 37 | else if (!m_receiver && !b ) return; // we should disbale receiver and it is off |
37 | else if (m_receiver && !b ) { | 38 | else if (m_receiver && !b ) { |
38 | delete m_receiver; | 39 | delete m_receiver; |
39 | m_receiver=0; | 40 | m_receiver=0; |
40 | }else if (!m_receiver && b ) { | 41 | }else if (!m_receiver && b ) { |
41 | m_receiver= new Receiver; | 42 | m_receiver= new Receiver; |
42 | } | 43 | } |
43 | } | 44 | } |
44 | void ObexHandler::slotSent() { | 45 | void ObexHandler::slotSent() { |
45 | QString file = m_sender->file(); | 46 | QString file = m_sender->file(); |
46 | delete m_sender; | 47 | delete m_sender; |
47 | m_sender = 0; | 48 | m_sender = 0; |
48 | QCopEnvelope e ("QPE/Obex", "done(QString)" ); | 49 | QCopEnvelope e ("QPE/Obex", "done(QString)" ); |
49 | e << file; | 50 | e << file; |
50 | doReceive(m_wasRec ); | 51 | doReceive(m_wasRec ); |
51 | m_wasRec = false; | 52 | m_wasRec = false; |
52 | } | 53 | } |
53 | void ObexHandler::irdaMessage( const QCString& msg, const QByteArray& data) { | 54 | void ObexHandler::irdaMessage( const QCString& msg, const QByteArray& data) { |
54 | QDataStream stream( data, IO_ReadOnly ); | 55 | QDataStream stream( data, IO_ReadOnly ); |
55 | if ( msg == "send(QString,QString,QString)" ) { | 56 | if ( msg == "send(QString,QString,QString)" ) { |
56 | QString name, desc; | 57 | QString name, desc; |
57 | stream >> desc; | 58 | stream >> desc; |
58 | stream >> name; | 59 | stream >> name; |
59 | m_wasRec = (m_receiver != 0 ); | 60 | m_wasRec = (m_receiver != 0 ); |
60 | doReceive( false ); | 61 | doReceive( false ); |
61 | doSend(name, desc); | 62 | doSend(name, desc); |
62 | }else if (msg == "receive(int)") { | 63 | }else if (msg == "receive(int)") { |
63 | int rec; | 64 | int rec; |
64 | stream >> rec; | 65 | stream >> rec; |
65 | doReceive(rec); | 66 | doReceive(rec); |
66 | } | 67 | } |
67 | } | 68 | } |