author | zecke <zecke> | 2003-03-14 08:23:21 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-03-14 08:23:21 (UTC) |
commit | 52c72efc3bcc6b57c6960b5da3393b57182b5ee6 (patch) (unidiff) | |
tree | 42bb8ed6f48484fd02912354a11086a51b3bd17c /core | |
parent | 7e04934c4b7b9f8ad0d74d2da1c7c1273d9fe1d4 (diff) | |
download | opie-52c72efc3bcc6b57c6960b5da3393b57182b5ee6.zip opie-52c72efc3bcc6b57c6960b5da3393b57182b5ee6.tar.gz opie-52c72efc3bcc6b57c6960b5da3393b57182b5ee6.tar.bz2 |
Unconfuse eilers about naming variables :)
I hate big gray squares in a TextView better include
pics/obex/* to the obex2 package...
-rw-r--r-- | core/obex/libopieobex0.control | 6 | ||||
-rw-r--r-- | core/obex/obexhandler.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control index d74b51c..6df9f36 100644 --- a/core/obex/libopieobex0.control +++ b/core/obex/libopieobex0.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: plugins/obex/libopieobex.so* | 1 | Files: plugins/obex/libopieobex.so* pics/obex/* |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/system | 3 | Section: opie/system |
4 | Maintainer: Holger Freyther <zecke@handhelds.org> | 4 | Maintainer: hOlgar Freyther <zecke@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION.1 | 6 | Version: $QPE_VERSION-$SUB_VERSION.1 |
7 | Depends: opie-base ($QPE_VERSION), openobex | 7 | Depends: opie-base ($QPE_VERSION), openobex |
8 | Description: Irda obex lib | 8 | Description: Irda obex lib |
9 | \ No newline at end of file | 9 | |
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp index 16e1c2f..6509d12 100644 --- a/core/obex/obexhandler.cpp +++ b/core/obex/obexhandler.cpp | |||
@@ -49,17 +49,17 @@ void ObexHandler::slotSent() { | |||
49 | m_wasRec = false; | 49 | m_wasRec = false; |
50 | } | 50 | } |
51 | void ObexHandler::irdaMessage( const QCString& msg, const QByteArray& data) { | 51 | void ObexHandler::irdaMessage( const QCString& msg, const QByteArray& data) { |
52 | QDataStream stream( data, IO_ReadOnly ); | 52 | QDataStream stream( data, IO_ReadOnly ); |
53 | if ( msg == "send(QString,QString,QString)" ) { | 53 | if ( msg == "send(QString,QString,QString)" ) { |
54 | QString name, desc; | 54 | QString name, desc; |
55 | stream >> name; | ||
56 | stream >> desc; | 55 | stream >> desc; |
56 | stream >> name; | ||
57 | m_wasRec = (m_receiver != 0 ); | 57 | m_wasRec = (m_receiver != 0 ); |
58 | doReceive( false ); | 58 | doReceive( false ); |
59 | doSend(desc, name); | 59 | doSend(name, desc); |
60 | }else if (msg == "receive(int)") { | 60 | }else if (msg == "receive(int)") { |
61 | int rec; | 61 | int rec; |
62 | stream >> rec; | 62 | stream >> rec; |
63 | doReceive(rec); | 63 | doReceive(rec); |
64 | } | 64 | } |
65 | } | 65 | } |