Remove debugging output

Fix possible crashes in io_bt and io_irda

18 files changed, 3 insertions, 55 deletions

diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index ae01392..b6ae1d9 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -113,9 +113,8 @@ void MyPty::donePty()
 
     ::close(m_fd);
 
     if (m_cpid) {
-        qWarning("killing!!!");
 	kill(m_cpid, SIGHUP);
 	//waitpid(m_cpid, &status, 0);
         delete m_sn_e;
         m_sn_e = 0l;
@@ -133,9 +132,8 @@ const char* MyPty::deviceName()
 
 
 void MyPty::error()
 {
-    qWarning("error");
     // This is code from the Qt DumbTerminal example
     donePty();
 }
 
@@ -267,9 +265,8 @@ void MyPty::reload( const Profile& ) {
 }
 /*! sends len bytes through the line */
 void MyPty::send(const QByteArray& ar)
 {
-    qWarning("sending!");
 #ifdef VERBOSE_DEBUG
   // verbose debug
   printf("sending bytes:\n");
   for (uint i = 0; i < ar.count(); i++)
@@ -282,17 +279,14 @@ void MyPty::send(const QByteArray& ar)
 
 /*! indicates that a block of data is received */
 void MyPty::readPty()
 {
-    qWarning("read");
   QByteArray buf(4096);
 
   int len = ::read( m_fd, buf.data(), 4096 );
 
   if (len == -1 || len == 0) {
-      qWarning("donePty!!! now!");
      donePty();
-     qWarning("return %s", sender()->className() );
      delete sender();
      return;
   }
 
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index 8745305..0bc6588 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -91,9 +91,8 @@ void ConfigDialog::slotEdit() {
 }
 
 
 void ConfigDialog::slotAdd() {
-    qWarning("slotAdd");
 	ProfileEditorDialog dlg(m_fact);
 
 	dlg.setCaption("New Connection");
 	dlg.showMaximized();
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp
index 836a05b..b2cd348 100644
--- a/noncore/apps/opie-console/emulation_handler.cpp
+++ b/noncore/apps/opie-console/emulation_handler.cpp
@@ -36,13 +36,11 @@ void EmulationHandler::load( const Profile& prof) {
     setColor( foreColor(num), backColor(num) );
      m_teWid->setBackgroundColor(backColor(num) );
 }
 void EmulationHandler::recv( const QByteArray& ar) {
-    qWarning("received in EmulationHandler!");
     m_teEmu->onRcvBlock(ar.data(), ar.count() );
 }
 void EmulationHandler::recvEmulation(const char* src, int len ) {
-    qWarning("received from te ");
     QByteArray ar(len);
 
     memcpy(ar.data(), src, sizeof(char) * len );
 
@@ -98,14 +96,12 @@ QColor EmulationHandler::foreColor(int col) {
     /* we need to switch it */
     switch( col ) {
     default:
     case Profile::White:
-        qWarning("Foreground black");
         /* color is black */
         co = Qt::white;
         break;
     case Profile::Black:
-        qWarning("Foreground white");
         co = Qt::black;
         break;
     case Profile::Green:
         qWarning("Foreground green");
@@ -125,14 +121,12 @@ QColor EmulationHandler::backColor(int col ) {
     /* we need to switch it */
     switch( col ) {
     default:
     case Profile::White:
-        qWarning("Background white");
         /* color is white */
         co = Qt::black;
         break;
     case Profile::Black:
-        qWarning("Background black");
         co = Qt::white;
         break;
     case Profile::Green:
         qWarning("Background black");
diff --git a/noncore/apps/opie-console/filereceive.cpp b/noncore/apps/opie-console/filereceive.cpp
index 26b3dec..e517862 100644
--- a/noncore/apps/opie-console/filereceive.cpp
+++ b/noncore/apps/opie-console/filereceive.cpp
@@ -134,15 +134,13 @@ void FileReceive::setupChild() {
 }
 void FileReceive::slotRead() {
     QByteArray ar(4096);
     int len = read(m_comm[0], ar.data(), 4096 );
-    qWarning("slot read %d", len);
     for (int i = 0; i < len; i++ ) {
         // printf("%c", ar[i] );
     }
     ar.resize( len );
     QString str( ar );
-    qWarning(str.simplifyWhiteSpace() );
 }
 void FileReceive::slotExec() {
     char buf[2];
     ::read(m_term[0], buf, 1 );
diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp
index 8ca0df2..b81c2a2 100644
--- a/noncore/apps/opie-console/filetransfer.cpp
+++ b/noncore/apps/opie-console/filetransfer.cpp
@@ -52,9 +52,8 @@ void FileTransfer::sendFile( const QString& file ) {
         slotExec();
         break;
     case 0:{
         setupChild();
-        qWarning("output:"+file );
         /* exec */
         char* verbose = "-vv";
         char* binray = "-b";
 
@@ -165,21 +164,18 @@ void FileTransfer::setupChild() {
  */
 void FileTransfer::slotRead() {
     QByteArray ar(4096);
     int len = read(m_comm[0], ar.data(), 4096 );
-    qWarning("slot read %d", len);
     for (int i = 0; i < len; i++ ) {
         // printf("%c", ar[i] );
     }
     ar.resize( len );
     QString str( ar );
-    qWarning(str.simplifyWhiteSpace() );
     QStringList lis = QStringList::split(' ', str );
     /*
      * Transfer finished.. either complete or incomplete
      */
     if ( lis[0].simplifyWhiteSpace() == "Transfer" ) {
-        qWarning("sent!!!!");
         return;
     }
     /*
      * do progress reading
@@ -213,9 +209,8 @@ void FileTransfer::slotProgress( const QStringList& list ) {
     if (!complete || total == 0) {
         return;
     }
 
-    qWarning("%s, %d, %d",  progi.join("/").latin1(), sent, total );
 
     double pro = (double)sent/total;
     int prog = pro * 100;
 
@@ -239,9 +234,8 @@ void FileTransfer::cancel() {
     if(m_pid > 0) ::kill(m_pid,9 );
     
 }
 void FileTransfer::slotExec() {
-    qWarning("exited!");
     char buf[2];
     ::read(m_term[0], buf, 1 );
     delete m_proc;
     delete m_not;
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 8bff4df..0831faf 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -35,8 +35,9 @@ bool IOBt::open() {
         IOSerial::open();
     } else {
         qWarning("could not attach to device");
         delete m_attach;
+	m_attach = 0;
     }
 }
 
 void IOBt::reload( const Profile &config ) {
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index 8e31e82..56a373c 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -31,10 +31,12 @@ bool IOIrda::open() {
 
     if ( m_attach->start() ) {
         IOSerial::open();
     } else {
+    // emit error!!!
         qWarning("could not attach to device");
         delete m_attach;
+	m_attach = 0l;
     }
 }
 
 void IOIrda::reload( const Profile &config ) {
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index 03f1b1a..a4a6f0b 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -26,9 +26,8 @@ void IOSerial::send(const QByteArray &data) {
     }
 }
 
 void IOSerial::close() {
-    qWarning("closing!");
     if (m_fd) {
         delete m_read;
         delete m_error;
         ::close(m_fd);
@@ -38,24 +37,20 @@ void IOSerial::close() {
     }
 }
 
 bool IOSerial::open() {
-    qWarning("open");
     if (!m_fd) {
-        qWarning("going to open %s",  m_device.latin1());
         struct termios tty;
         m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK);
         if (m_fd < 0) {
-            qWarning(" fd < 0 ");
             emit error(CouldNotOpen, strerror(errno));
             return FALSE;
         }
         tcgetattr(m_fd, &tty);
 
         /* Baud rate */
         int speed = baud(m_baud);
         if (speed == -1) {
-            qWarning("speed -1");
             emit error(Refuse, tr("Invalid baud rate"));
         }
         cfsetospeed(&tty, speed);
         cfsetispeed(&tty, speed);
@@ -117,19 +112,16 @@ bool IOSerial::open() {
         connect(m_read, SIGNAL(activated(int)), this, SLOT(dataArrived()));
         connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured()));
         return TRUE;
     } else {
-        qWarning(" already opened");
         emit error(Refuse, tr("Device is already connected"));
         m_fd = 0;
         return FALSE;
     }
 }
 
 void IOSerial::reload(const Profile &config) {
     m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE);
-    qWarning( "Dev" +m_device );
-    qWarning( "Conf:" +config.readEntry("Device") );
     m_baud = config.readNumEntry("Speed", SERIAL_DEFAULT_BAUD);
     m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY);
     m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS);
     m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS);
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp
index 49ed284..b0df02d 100644
--- a/noncore/apps/opie-console/iolayerbase.cpp
+++ b/noncore/apps/opie-console/iolayerbase.cpp
@@ -128,15 +128,12 @@ void IOLayerBase::setSpeed( Speed sp ) {
     m_speedBox->setCurrentItem(index );
 }
 IOLayerBase::Flow IOLayerBase::flow()const {
     if (m_flowHw->isChecked() ) {
-        qWarning("Hardware flow");
         return Hardware;
     }else if( m_flowSw->isChecked() ) {
-        qWarning("Software");
         return Software;
     } else {
-        qWarning("None");
         return None;
     }
 }
 IOLayerBase::Parity IOLayerBase::parity()const {
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index b770551..94c99bc 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -262,9 +262,8 @@ QList<Session> MainWindow::sessions() {
     return m_sessions;
 }
 
 void MainWindow::slotNew() {
-    qWarning("New Connection");
     ProfileEditorDialog dlg(factory() );
     dlg.showMaximized();
     int ret = dlg.exec();
 
@@ -338,16 +337,14 @@ void MainWindow::slotTerminate() {
     /* FIXME move to the next session */
 }
 
 void MainWindow::slotConfigure() {
-    qWarning("configure");
     ConfigDialog conf( manager()->all(), factory() );
     conf.showMaximized();
 
     int ret = conf.exec();
 
     if ( QDialog::Accepted == ret ) {
-        qWarning("conf %d", conf.list().count() );
         manager()->setProfiles( conf.list() );
         manager()->save();
         populateProfiles();
     }
@@ -359,9 +356,8 @@ void MainWindow::slotConfigure() {
  * delete it
  * and set the currentSession()
  */
 void MainWindow::slotClose() {
-    qWarning("close");
     if (!currentSession() )
         return;
 
     tabWidget()->remove( currentSession() );
@@ -437,9 +433,8 @@ void MainWindow::slotOpenKeb(bool state) {
 
 }
 void MainWindow::slotSessionChanged( Session* ses ) {
     if ( ses ) {
-        qWarning("changing %s", ses->name().latin1() );
         m_curSession = ses;
 
         if ( m_curSession->isConnected() ) {
             m_connect->setEnabled( false );
diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index 09ba586..04a5dfa 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -119,9 +119,8 @@ ProfileDialogWidget *MetaFactory::newConnectionPlugin ( const QString& str, QWid
 ProfileDialogWidget *MetaFactory::newTerminalPlugin( const QString& str, QWidget *parent) {
     if (str.isEmpty() )
         return 0l;
     ProfileDialogWidget* wid = 0l;
-    qWarning("new terminalPlugin %s %l", str.latin1(), parent );
 
     QMap<QString, configWidget>::Iterator it;
     it = m_termFact.find( str );
     if ( it != m_termFact.end() ) {
diff --git a/noncore/apps/opie-console/procctl.cpp b/noncore/apps/opie-console/procctl.cpp
index d1cfaf6..ff6bea8 100644
--- a/noncore/apps/opie-console/procctl.cpp
+++ b/noncore/apps/opie-console/procctl.cpp
@@ -70,9 +70,8 @@ int ProcCtl::status(pid_t pid )const{
     }
     return -1;
 }
 void ProcCtl::signal_handler(int) {
-    qWarning("signal handler in ProcCtl");
     int status;
     signal( SIGCHLD,  signal_handler );
     pid_t pi = waitpid( -1, &status, WNOHANG  );
 
diff --git a/noncore/apps/opie-console/profile.cpp b/noncore/apps/opie-console/profile.cpp
index ffd672e..1a94619 100644
--- a/noncore/apps/opie-console/profile.cpp
+++ b/noncore/apps/opie-console/profile.cpp
@@ -77,13 +77,11 @@ void Profile::setTerminal( int term ) {
 void Profile::clearConf() {
     m_conf.clear();
 }
 void Profile::writeEntry( const QString& key,  const QString& value ) {
-    qWarning("key %s value %s", key.latin1(), value.latin1() );
     m_conf.replace( key, value );
 }
 void Profile::writeEntry( const QString& key, int num ) {
-    qWarning("num");
     writeEntry( key,  QString::number( num ) );
 }
 void Profile::writeEntry( const QString& key, bool b ) {
     writeEntry( key, QString::number(b) );
diff --git a/noncore/apps/opie-console/profileconfig.cpp b/noncore/apps/opie-console/profileconfig.cpp
index 732fae7..bd089c8 100644
--- a/noncore/apps/opie-console/profileconfig.cpp
+++ b/noncore/apps/opie-console/profileconfig.cpp
@@ -11,9 +11,8 @@ ProfileConfig::~ProfileConfig() {
 QStringList ProfileConfig::groups()const {
     QStringList list;
     QMap<QString, ConfigGroup>::ConstIterator it;
     it= Config::groups.begin();
-    qWarning("config %d", Config::groups.count() );
 
     for (; it != Config::groups.end(); ++it )
         list << it.key();
 
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 094c871..b709cf3 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -114,12 +114,8 @@ void ProfileEditorDialog::initUI()
     slotTermActivated( m_fact->external(m_prof.terminalName() ) );
     setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb );
     setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
 
-    qWarning("Layer: %s %s", m_prof.ioLayerName().data(),
-             m_fact->external(m_prof.ioLayerName() ).latin1() );
-    qWarning("Term: %s %s", m_prof.terminalName().data(),
-             m_fact->external(m_prof.terminalName() ).latin1() );
 
     // signal and slots
     connect(m_conCmb, SIGNAL(activated(const QString& ) ),
             this, SLOT(slotConActivated(const QString&) ) );
@@ -146,10 +142,8 @@ void ProfileEditorDialog::accept()
 	// Save general values
 	m_prof.setName(profName());
 	m_prof.setIOLayer(      m_fact->internal(m_conCmb ->currentText()  ) );
         m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText()  ) );
-        qWarning("Term %s %s", m_fact->internal(m_termCmb->currentText() ).data(),
-                 m_termCmb->currentText().latin1() );
 
         if (m_con )
             m_con->save( m_prof );
         if (m_term )
@@ -189,9 +183,8 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) {
  */
 void ProfileEditorDialog::slotTermActivated( const QString& str ) {
     delete m_term;
     m_term = m_fact->newTerminalPlugin( str, m_tabTerm );
-    qWarning("past");
 
     if (m_term) {
         m_term->load(m_prof );
         m_layTerm->addWidget( m_term );
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp
index 95a46f9..e5aedb6 100644
--- a/noncore/apps/opie-console/profilemanager.cpp
+++ b/noncore/apps/opie-console/profilemanager.cpp
@@ -23,24 +23,21 @@ ProfileManager::~ProfileManager() {
 
 }
 void ProfileManager::load() {
     m_list.clear();
-    qWarning("load");
     ProfileConfig conf("opie-console-profiles");
     QStringList groups = conf.groups();
     QStringList::Iterator it;
 
     /*
      * for each profile
      */
     for ( it = groups.begin(); it != groups.end(); ++it ) {
-        qWarning("group " + (*it) );
         conf.setGroup( (*it) );
         Profile prof;
         prof.setName( conf.readEntry("name") );
         prof.setIOLayer( conf.readEntry("iolayer").utf8() );
         prof.setTerminalName( conf.readEntry("term").utf8() );
-        qWarning(" %s %s", conf.readEntry("iolayer").latin1(), prof.ioLayerName().data() );
         prof.setBackground( conf.readNumEntry("back") );
         prof.setForeground( conf.readNumEntry("fore") );
         prof.setTerminal( conf.readNumEntry("terminal") );
 
@@ -120,9 +117,8 @@ void ProfileManager::save(  ) {
         }
 
         conf.writeEntry( "name", (*it2).name() );
         QString str = QString::fromUtf8( (*it2).ioLayerName() );
-	qWarning("IOLayerName " + str );
 
         conf.writeEntry( "iolayer", str );
         conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName()  ) );
         conf.writeEntry( "back", (*it2).background() );
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp
index d0ace6c..e53dbc4 100644
--- a/noncore/apps/opie-console/session.cpp
+++ b/noncore/apps/opie-console/session.cpp
@@ -46,9 +46,8 @@ void Session::connect() {
         return;
 
     m_connected = true;
 
-    qWarning("connection in session");
     QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ),
             m_emu, SLOT(recv(const QByteArray&) ) );
     QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ),
             m_layer, SLOT(send(const QByteArray&) ) );
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp
index 466b536..8a691f9 100644
--- a/noncore/apps/opie-console/tabwidget.cpp
+++ b/noncore/apps/opie-console/tabwidget.cpp
@@ -11,9 +11,8 @@ TabWidget::~TabWidget() {
 }
 
 void TabWidget::add( Session* ses ) {
     if ( !ses->widgetStack() ) return;
-    qWarning("going to add it");
     //reparent( ses->widgetStack(), QPoint() );
     addTab( ses->widgetStack(), "console/konsole", ses->name() );
     //addTab( ses->widgetStack(), ses->name() );
     m_map.insert( ses->widgetStack(), ses );