author | zecke <zecke> | 2006-05-14 14:34:43 (UTC) |
---|---|---|
committer | zecke <zecke> | 2006-05-14 14:34:43 (UTC) |
commit | 273ffc42b3f0ce593e0d20874a7f224328416445 (patch) (side-by-side diff) | |
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 @@ -1,14 +1,15 @@ #ifndef OpieBtObex_H #define OpieBtObex_H #include <qobject.h> -#include <opietooth/services.h> -#include <opietooth/manager.h> +#include <services.h> +#include <manager.h> +#include <obexpush.h> namespace Opie {namespace Core {class OProcess;}} class QCopChannel; using namespace OpieTooth; namespace OpieObex { // Maybe this should be derved from Obex. @@ -56,31 +57,34 @@ namespace OpieObex { private: uint m_count; QString m_file; QString m_outp; QString m_bdaddr; int m_port; - Opie::Core::OProcess *m_send; + ObexPush* m_send; Opie::Core::OProcess *m_rec; bool m_receive : 1; OpieTooth::Manager* btManager; void shutDownReceive(); private slots: + // Push process slots + void slotPushStatus(QCString&); + void slotPushComplete(int); + void slotPushError(int); + // the process exited void slotExited(Opie::Core::OProcess*) ; void slotStdOut(Opie::Core::OProcess*, char*, int); void slotError(); void slotFoundServices(const QString&, Services::ValueList); private: void sendNow(); QString parseOut(); void received(); - void sendEnd(); - }; }; #endif |