summaryrefslogtreecommitdiff
path: root/core
authorkorovkin <korovkin>2006-11-14 21:29:08 (UTC)
committer korovkin <korovkin>2006-11-14 21:29:08 (UTC)
commit663a33f463ac184b10cb3adc354f62a6a5c3e2b0 (patch) (side-by-side diff)
tree712fd278f04b45287f6b849a0083806989763342 /core
parentb06913999f349254ba1c6e182950cb71d0b7aa67 (diff)
downloadopie-663a33f463ac184b10cb3adc354f62a6a5c3e2b0.zip
opie-663a33f463ac184b10cb3adc354f62a6a5c3e2b0.tar.gz
opie-663a33f463ac184b10cb3adc354f62a6a5c3e2b0.tar.bz2
Removed class members that shadowed the base class members, which
caused the system crash.
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obex.cpp3
-rw-r--r--core/obex/obex.h4
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
@@ -46,13 +46,13 @@ 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() {
@@ -77,13 +77,12 @@ 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();
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
@@ -78,18 +78,14 @@ namespace OpieObex {
* 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