author | mickeyl <mickeyl> | 2006-05-02 08:57:25 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2006-05-02 08:57:25 (UTC) |
commit | d5b6868cb4f99d2c3dc3587115cd37c09e4610eb (patch) (unidiff) | |
tree | 1397f12f885c849419e511ad203d19696c4ae07e /core/obex/btobex.h | |
parent | 1295db77f2ab7e9125183e4240de0b92f72940e4 (diff) | |
download | opie-d5b6868cb4f99d2c3dc3587115cd37c09e4610eb.zip opie-d5b6868cb4f99d2c3dc3587115cd37c09e4610eb.tar.gz opie-d5b6868cb4f99d2c3dc3587115cd37c09e4610eb.tar.bz2 |
bluetooth patches courtesy Dmitriy Korovkin (thanks!):
* When sending data to a device, do service discovery in order to get port number.
* Switched to ussp-push for sending.
* Clear receivers list on rescan.
* Changed the way of window closing in order to shut down IRDA and bluetooth correctly.
-rw-r--r-- | core/obex/btobex.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/obex/btobex.h b/core/obex/btobex.h index 5ab591c..099f04a 100644 --- a/core/obex/btobex.h +++ b/core/obex/btobex.h | |||
@@ -1,15 +1,18 @@ | |||
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 <services.h> | ||
8 | #include <manager.h> | ||
7 | 9 | ||
8 | namespace Opie {namespace Core {class OProcess;}} | 10 | namespace Opie {namespace Core {class OProcess;}} |
9 | class QCopChannel; | 11 | class QCopChannel; |
12 | using namespace OpieTooth; | ||
10 | namespace OpieObex { | 13 | namespace OpieObex { |
11 | // Maybe this should be derved from Obex. | 14 | // Maybe this should be derved from Obex. |
12 | class BtObex : public QObject { | 15 | class BtObex : public QObject { |
13 | Q_OBJECT | 16 | Q_OBJECT |
14 | public: | 17 | public: |
15 | /** | 18 | /** |
@@ -52,23 +55,26 @@ namespace OpieObex { | |||
52 | 55 | ||
53 | private: | 56 | private: |
54 | uint m_count; | 57 | uint m_count; |
55 | QString m_file; | 58 | QString m_file; |
56 | QString m_outp; | 59 | QString m_outp; |
57 | QString m_bdaddr; | 60 | QString m_bdaddr; |
61 | int m_port; | ||
58 | Opie::Core::OProcess *m_send; | 62 | Opie::Core::OProcess *m_send; |
59 | Opie::Core::OProcess *m_rec; | 63 | Opie::Core::OProcess *m_rec; |
60 | bool m_receive : 1; | 64 | bool m_receive : 1; |
65 | OpieTooth::Manager* btManager; | ||
61 | void shutDownReceive(); | 66 | void shutDownReceive(); |
62 | 67 | ||
63 | private slots: | 68 | private slots: |
64 | 69 | ||
65 | // the process exited | 70 | // the process exited |
66 | void slotExited(Opie::Core::OProcess* proc) ; | 71 | void slotExited(Opie::Core::OProcess*) ; |
67 | void slotStdOut(Opie::Core::OProcess*, char*, int); | 72 | void slotStdOut(Opie::Core::OProcess*, char*, int); |
68 | void slotError(); | 73 | void slotError(); |
74 | void slotFoundServices(const QString&, Services::ValueList); | ||
69 | 75 | ||
70 | private: | 76 | private: |
71 | void sendNow(); | 77 | void sendNow(); |
72 | QString parseOut(); | 78 | QString parseOut(); |
73 | void received(); | 79 | void received(); |
74 | void sendEnd(); | 80 | void sendEnd(); |