author | korovkin <korovkin> | 2006-11-14 21:29:08 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-11-14 21:29:08 (UTC) |
commit | 663a33f463ac184b10cb3adc354f62a6a5c3e2b0 (patch) (unidiff) | |
tree | 712fd278f04b45287f6b849a0083806989763342 /core | |
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 ) | |||
49 | : ObexBase(parent, name ) | 49 | : ObexBase(parent, name ) |
50 | { | 50 | { |
51 | m_rec = 0; | 51 | m_rec = 0; |
52 | m_send=0; | 52 | m_send = 0; |
53 | }; | 53 | }; |
54 | Obex::~Obex() { | 54 | Obex::~Obex() { |
55 | delete m_rec; | 55 | delete m_rec; |
@@ -80,7 +80,6 @@ void Obex::send(const QString& fileName, const QString& addr) { | |||
80 | emit error(-1 ); | 80 | emit error(-1 ); |
81 | delete m_rec; | 81 | delete m_rec; |
82 | m_rec = 0; | 82 | m_rec = 0; |
83 | |||
84 | }else{ | 83 | }else{ |
85 | emit error( -1 ); // we did not delete yet but it's not running slotExited is pending | 84 | emit error( -1 ); // we did not delete yet but it's not running slotExited is pending |
86 | return; | 85 | 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 { | |||
81 | void done(bool); | 81 | void done(bool); |
82 | 82 | ||
83 | private: | 83 | private: |
84 | uint m_count; | ||
85 | QString m_file; | ||
86 | QString m_outp; | ||
87 | Opie::Core::OProcess *m_send; | 84 | Opie::Core::OProcess *m_send; |
88 | ObexServer* m_rec; //The OBEX server | 85 | ObexServer* m_rec; //The OBEX server |
89 | bool m_receive : 1; | ||
90 | void shutDownReceive(); | 86 | void shutDownReceive(); |
91 | 87 | ||
92 | private slots: | 88 | private slots: |