| -rw-r--r-- | core/obex/obex.cc | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/core/obex/obex.cc b/core/obex/obex.cc index 7c40b90..5dfcfb5 100644 --- a/core/obex/obex.cc +++ b/core/obex/obex.cc @@ -36,3 +36,2 @@ void Obex::receive() { m_outp = QString::null; - owarn << "Receive" << oendl; m_rec = new OProcess(); @@ -47,3 +46,2 @@ void Obex::receive() { if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { - owarn << "could not start :(" oendl; emit done( false ); @@ -52,5 +50,4 @@ void Obex::receive() { } -// emit currentTry(m_count ); - } + void Obex::send( const QString& fileName) { // if currently receiving stop it send receive @@ -58,8 +55,5 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se m_file = fileName; - owarn << "send " << fileName.latin1() << oendl; if (m_rec != 0 ) { - owarn << "running" oendl; if (m_rec->isRunning() ) { emit error(-1 ); - owarn << "is running" << oendl; delete m_rec; @@ -68,3 +62,2 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se }else{ - owarn << "is not running" << oendl; emit error( -1 ); // we did not delete yet but it's not running slotExited is pending @@ -76,3 +69,2 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se void Obex::sendNow(){ - owarn << "sendNow" << oendl; if ( m_count >= 25 ) { // could not send @@ -95,3 +87,2 @@ void Obex::sendNow(){ if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) { - owarn << "could not send" << oendl; m_count = 25; @@ -107,7 +98,7 @@ void Obex::sendNow(){ void Obex::slotExited(OProcess* proc ){ - if (proc == m_rec ) { // receive process + if (proc == m_rec ) // receive process received(); - }else if ( proc == m_send ) { + else if ( proc == m_send ) sendEnd(); - } + } @@ -117,3 +108,2 @@ void Obex::slotStdOut(OProcess* proc, char* buf, int len){ memcpy( ar.data(), buf, len ); - owarn << "parsed: " << ar.data() << oendl; m_outp.append( ar ); @@ -126,3 +116,2 @@ void Obex::received() { QString filename = parseOut(); - owarn << "ACHTUNG " << filename.latin1() << oendl; emit receivedFile( filename ); @@ -142,3 +131,2 @@ void Obex::sendEnd() { m_send=0; - owarn << "done" << oendl; emit sent(true); @@ -148,3 +136,2 @@ void Obex::sendEnd() { m_send = 0; - owarn << "try sending again" << oendl; sendNow(); @@ -165,10 +152,6 @@ QString Obex::parseOut( ){ if ( pos > 0 ) { - owarn << pos << " " << (*it).mid(6 ).latin1() << oendl; - owarn << (*it).length() << " " << (*it).length()-pos << oendl; path = (*it).remove( pos, (*it).length() - pos ); - owarn << path.latin1() << oendl; path = path.mid(6 ); path = path.stripWhiteSpace(); - owarn << "path " << path.latin1() << oendl; } @@ -182,3 +165,2 @@ QString Obex::parseOut( ){ void Obex::slotError() { - owarn << "slotError" << oendl; if ( m_receive ) @@ -195,6 +177,4 @@ void Obex::shutDownReceive() { if (m_rec != 0 ) { - owarn << "running" << oendl; if (m_rec->isRunning() ) { emit error(-1 ); - owarn << "is running" << oendl; delete m_rec; |