summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2006-11-14 21:29:08 (UTC)
committer korovkin <korovkin>2006-11-14 21:29:08 (UTC)
commit663a33f463ac184b10cb3adc354f62a6a5c3e2b0 (patch) (unidiff)
tree712fd278f04b45287f6b849a0083806989763342
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 (more/less context) (show whitespace changes)
-rw-r--r--core/obex/obex.cpp1
-rw-r--r--core/obex/obex.h4
2 files changed, 0 insertions, 5 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
@@ -71,25 +71,24 @@ void Obex::receive() {
71 m_rec = 0; 71 m_rec = 0;
72 } 72 }
73} 73}
74 74
75// if currently receiving stop it send receive 75// if currently receiving stop it send receive
76void Obex::send(const QString& fileName, const QString& addr) { 76void Obex::send(const QString& fileName, const QString& addr) {
77 ObexBase::send(fileName, addr); 77 ObexBase::send(fileName, addr);
78 if (m_rec != 0 ) { 78 if (m_rec != 0 ) {
79 if (m_rec->isRunning() ) { 79 if (m_rec->isRunning() ) {
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;
87 } 86 }
88 } 87 }
89 sendNow(); 88 sendNow();
90} 89}
91void Obex::sendNow(){ 90void Obex::sendNow(){
92 if ( m_count >= 25 ) { // could not send 91 if ( m_count >= 25 ) { // could not send
93 emit error(-1 ); 92 emit error(-1 );
94 emit sent(false); 93 emit sent(false);
95 return; 94 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
@@ -72,30 +72,26 @@ namespace OpieObex {
72 void error( int ); 72 void error( int );
73 /** 73 /**
74 * The current try to receive data 74 * The current try to receive data
75 */ 75 */
76 void currentTry(unsigned int); 76 void currentTry(unsigned int);
77 /** 77 /**
78 * signal sent The file got beamed to the remote location 78 * signal sent The file got beamed to the remote location
79 */ 79 */
80 void sent(bool); 80 void sent(bool);
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
92private slots: 88private slots:
93 89
94 /** 90 /**
95 * send over palm obex 91 * send over palm obex
96 */ 92 */
97 93
98 //void send(const QString&); 94 //void send(const QString&);
99 95
100 // the process exited 96 // the process exited
101 void slotExited(Opie::Core::OProcess* proc) ; 97 void slotExited(Opie::Core::OProcess* proc) ;