-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 | |||
@@ -1,20 +1,21 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #ifndef OpieBtObex_H | 3 | #ifndef OpieBtObex_H |
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; |
12 | using namespace OpieTooth; | 13 | using namespace OpieTooth; |
13 | namespace OpieObex { | 14 | namespace OpieObex { |
14 | // Maybe this should be derved from Obex. | 15 | // Maybe this should be derved from Obex. |
15 | class BtObex : public QObject { | 16 | class BtObex : public QObject { |
16 | Q_OBJECT | 17 | Q_OBJECT |
17 | public: | 18 | public: |
18 | /** | 19 | /** |
19 | * BtObex c'tor look | 20 | * BtObex c'tor look |
20 | */ | 21 | */ |
@@ -50,37 +51,40 @@ namespace OpieObex { | |||
50 | /** | 51 | /** |
51 | * signal sent The file got beamed to the remote location | 52 | * signal sent The file got beamed to the remote location |
52 | */ | 53 | */ |
53 | void sent(bool); | 54 | void sent(bool); |
54 | void done(bool); | 55 | void done(bool); |
55 | 56 | ||
56 | private: | 57 | private: |
57 | uint m_count; | 58 | uint m_count; |
58 | QString m_file; | 59 | QString m_file; |
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; |
66 | void shutDownReceive(); | 67 | void shutDownReceive(); |
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); |
73 | void slotError(); | 79 | void slotError(); |
74 | void slotFoundServices(const QString&, Services::ValueList); | 80 | void slotFoundServices(const QString&, Services::ValueList); |
75 | 81 | ||
76 | private: | 82 | private: |
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 | ||
85 | 89 | ||
86 | #endif | 90 | #endif |