author | zecke <zecke> | 2006-05-14 14:34:43 (UTC) |
---|---|---|
committer | zecke <zecke> | 2006-05-14 14:34:43 (UTC) |
commit | 273ffc42b3f0ce593e0d20874a7f224328416445 (patch) (unidiff) | |
tree | 04203fc463a711de981fc40ba390fcec8838d1eb /core/obex/btobex.h | |
parent | 89efebff8f5a00089f02397aa0778dd0dbbacdbb (diff) | |
download | opie-273ffc42b3f0ce593e0d20874a7f224328416445.zip opie-273ffc42b3f0ce593e0d20874a7f224328416445.tar.gz opie-273ffc42b3f0ce593e0d20874a7f224328416445.tar.bz2 |
core/obex: Patch from Dmitry Korovkin to use opietooth's OBEX implementation
for sending
-rw-r--r-- | core/obex/btobex.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/core/obex/btobex.h b/core/obex/btobex.h index ba50064..9c1ab70 100644 --- a/core/obex/btobex.h +++ b/core/obex/btobex.h | |||
@@ -4,8 +4,9 @@ | |||
4 | #define OpieBtObex_H | 4 | #define OpieBtObex_H |
5 | 5 | ||
6 | #include <qobject.h> | 6 | #include <qobject.h> |
7 | #include <opietooth/services.h> | 7 | #include <services.h> |
8 | #include <opietooth/manager.h> | 8 | #include <manager.h> |
9 | #include <obexpush.h> | ||
9 | 10 | ||
10 | namespace Opie {namespace Core {class OProcess;}} | 11 | namespace Opie {namespace Core {class OProcess;}} |
11 | class QCopChannel; | 12 | class QCopChannel; |
@@ -59,7 +60,7 @@ namespace OpieObex { | |||
59 | QString m_outp; | 60 | QString m_outp; |
60 | QString m_bdaddr; | 61 | QString m_bdaddr; |
61 | int m_port; | 62 | int m_port; |
62 | Opie::Core::OProcess *m_send; | 63 | ObexPush* m_send; |
63 | Opie::Core::OProcess *m_rec; | 64 | Opie::Core::OProcess *m_rec; |
64 | bool m_receive : 1; | 65 | bool m_receive : 1; |
65 | OpieTooth::Manager* btManager; | 66 | OpieTooth::Manager* btManager; |
@@ -67,6 +68,11 @@ namespace OpieObex { | |||
67 | 68 | ||
68 | private slots: | 69 | private slots: |
69 | 70 | ||
71 | // Push process slots | ||
72 | void slotPushStatus(QCString&); | ||
73 | void slotPushComplete(int); | ||
74 | void slotPushError(int); | ||
75 | |||
70 | // the process exited | 76 | // the process exited |
71 | void slotExited(Opie::Core::OProcess*) ; | 77 | void slotExited(Opie::Core::OProcess*) ; |
72 | void slotStdOut(Opie::Core::OProcess*, char*, int); | 78 | void slotStdOut(Opie::Core::OProcess*, char*, int); |
@@ -77,8 +83,6 @@ private slots: | |||
77 | void sendNow(); | 83 | void sendNow(); |
78 | QString parseOut(); | 84 | QString parseOut(); |
79 | void received(); | 85 | void received(); |
80 | void sendEnd(); | ||
81 | |||
82 | }; | 86 | }; |
83 | }; | 87 | }; |
84 | 88 | ||