author | aquadran <aquadran> | 2006-05-04 05:40:22 (UTC) |
---|---|---|
committer | aquadran <aquadran> | 2006-05-04 05:40:22 (UTC) |
commit | 9e9148941974ce65fb733b14dd8bb15fe099ec2c (patch) (side-by-side diff) | |
tree | e07db54c1bef85853f7037478c0f0ff56b09779e | |
parent | 1240155cf5865df0d0ce0e4bd04dfec68ec1ede5 (diff) | |
download | opie-9e9148941974ce65fb733b14dd8bb15fe099ec2c.zip opie-9e9148941974ce65fb733b14dd8bb15fe099ec2c.tar.gz opie-9e9148941974ce65fb733b14dd8bb15fe099ec2c.tar.bz2 |
fixed compilation opieobex
-rw-r--r-- | core/obex/btobex.cpp | 4 | ||||
-rw-r--r-- | core/obex/btobex.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp index bb5c06d..b8556da 100644 --- a/core/obex/btobex.cpp +++ b/core/obex/btobex.cpp @@ -1,52 +1,52 @@ #include "btobex.h" -#include <manager.h> -#include <services.h> +#include <opietooth/manager.h> +#include <opietooth/services.h> /* OPIE */ #include <opie2/oprocess.h> #include <opie2/odebug.h> /* QT */ #include <qfileinfo.h> #include <qstring.h> #include <qmap.h> #include <qmessagebox.h> using namespace OpieObex; using namespace Opie::Core; /* TRANSLATOR OpieObex::Obex */ using namespace OpieTooth; BtObex::BtObex( QObject *parent, const char* name ) : QObject(parent, name ) { m_rec = 0; m_send=0; m_count = 0; m_receive = false; connect( this, SIGNAL(error(int) ), // for recovering to receive SLOT(slotError() ) ); connect( this, SIGNAL(sent(bool) ), SLOT(slotError() ) ); btManager = NULL; }; BtObex::~BtObex() { if (btManager) delete btManager; delete m_rec; delete m_send; } void BtObex::receive() { m_receive = true; m_outp = QString::null; m_rec = new OProcess(); // TODO mbhaynie: No idea if this actually works -- maybe opd is better. *m_rec << "obexftpd" << "-b"; // connect to the necessary slots connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotExited(Opie::Core::OProcess*) ) ); diff --git a/core/obex/btobex.h b/core/obex/btobex.h index 099f04a..ba50064 100644 --- a/core/obex/btobex.h +++ b/core/obex/btobex.h @@ -1,56 +1,56 @@ #ifndef OpieBtObex_H #define OpieBtObex_H #include <qobject.h> -#include <services.h> -#include <manager.h> +#include <opietooth/services.h> +#include <opietooth/manager.h> namespace Opie {namespace Core {class OProcess;}} class QCopChannel; using namespace OpieTooth; namespace OpieObex { // Maybe this should be derved from Obex. class BtObex : public QObject { Q_OBJECT public: /** * BtObex c'tor look */ BtObex( QObject *parent, const char* name); /** * d'tor */ ~BtObex(); /** TODO mbhaynie -- Maybe opd would be a better way to receive. * Starting listening to Bluetooth after enabled by the applet * a signal gets emitted when received a file */ void receive(); void send( const QString&, const QString& ); void setReceiveEnabled( bool = false ); signals: /** * a signal * @param path The path to the received file */ void receivedFile( const QString& path); /** * error signal if the program couldn't be started or the * the connection timed out */ void error( int ); /** * The current try to receive data */ void currentTry(unsigned int); /** * signal sent The file got beamed to the remote location */ void sent(bool); void done(bool); private: |