| author | korovkin <korovkin> | 2006-11-14 21:29:08 (UTC) |
|---|---|---|
| committer | korovkin <korovkin> | 2006-11-14 21:29:08 (UTC) |
| commit | 663a33f463ac184b10cb3adc354f62a6a5c3e2b0 (patch) (side-by-side diff) | |
| tree | 712fd278f04b45287f6b849a0083806989763342 /core/obex | |
| parent | b06913999f349254ba1c6e182950cb71d0b7aa67 (diff) | |
| download | opie-663a33f463ac184b10cb3adc354f62a6a5c3e2b0.zip opie-663a33f463ac184b10cb3adc354f62a6a5c3e2b0.tar.gz opie-663a33f463ac184b10cb3adc354f62a6a5c3e2b0.tar.bz2 | |
Removed class members that shadowed the base class members, which
caused the system crash.
| -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 @@ -49,7 +49,7 @@ Obex::Obex( QObject *parent, const char* name ) : ObexBase(parent, name ) { m_rec = 0; - m_send=0; + m_send = 0; }; Obex::~Obex() { delete m_rec; @@ -80,7 +80,6 @@ void Obex::send(const QString& fileName, const QString& addr) { 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; 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 @@ -81,12 +81,8 @@ namespace OpieObex { 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: |