| -rw-r--r-- | core/obex/obex.cpp | 3 | ||||
| -rw-r--r-- | core/obex/obex.h | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/core/obex/obex.cpp b/core/obex/obex.cpp index e4a3c31..670f1a5 100644 --- a/core/obex/obex.cpp +++ b/core/obex/obex.cpp @@ -44,17 +44,17 @@ using namespace OpieObex; using namespace Opie::Core; /* TRANSLATOR OpieObex::Obex */ Obex::Obex( QObject *parent, const char* name ) : ObexBase(parent, name ) { m_rec = 0; - m_send=0; + m_send = 0; }; Obex::~Obex() { delete m_rec; delete m_send; } void Obex::receive() { ObexBase::receive(); m_rec = new ObexServer(OBEX_TRANS_IRDA); @@ -75,17 +75,16 @@ void Obex::receive() { // if currently receiving stop it send receive void Obex::send(const QString& fileName, const QString& addr) { ObexBase::send(fileName, addr); if (m_rec != 0 ) { if (m_rec->isRunning() ) { emit error(-1 ); delete m_rec; m_rec = 0; - }else{ emit error( -1 ); // we did not delete yet but it's not running slotExited is pending return; } } sendNow(); } void Obex::sendNow(){ diff --git a/core/obex/obex.h b/core/obex/obex.h index b948ce4..745f1c2 100644 --- a/core/obex/obex.h +++ b/core/obex/obex.h @@ -76,22 +76,18 @@ namespace OpieObex { void currentTry(unsigned int); /** * signal sent The file got beamed to the remote location */ void sent(bool); void done(bool); private: - uint m_count; - QString m_file; - QString m_outp; Opie::Core::OProcess *m_send; ObexServer* m_rec; //The OBEX server - bool m_receive : 1; void shutDownReceive(); private slots: /** * send over palm obex */ |