12 files changed, 115 insertions, 115 deletions

diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp
index b8a1925a..aedc0b9 100644
--- a/noncore/settings/networksettings/ppp/accounts.cpp
+++ b/noncore/settings/networksettings/ppp/accounts.cpp
@@ -117,9 +117,9 @@ void AccountWidget::create()
 
     int result;
     if (_pppdata->newaccount() == -1)
     {
-        qDebug("_pppdata->newaccount() == -1");
+        odebug << "_pppdata->newaccount() == -1" << oendl; 
         return;
     }
     result = doTab();
 
diff --git a/noncore/settings/networksettings/ppp/authwidget.cpp b/noncore/settings/networksettings/ppp/authwidget.cpp
index fa2b164..f3d842f 100644
--- a/noncore/settings/networksettings/ppp/authwidget.cpp
+++ b/noncore/settings/networksettings/ppp/authwidget.cpp
@@ -141,18 +141,18 @@ void AuthWidget::save()
 }
 
 void AuthWidget::authChanged( const QString &authStr )
 {
-    qDebug("AuthWidget::authChanged( %s )", authStr.latin1() );
+    odebug << "AuthWidget::authChanged( " << authStr.latin1() << " )" << oendl; 
     if ( authStr.contains( tr("Script-based") ) ){
         showUsernamePassword( false );
         showScriptWindow( true );
     } else if ( authStr.contains( tr("PAP") ) ||
                 authStr.contains( tr("CHAP") ) ){
         showUsernamePassword( true );
         showScriptWindow( false );
     } else {
-        qDebug("do not really know how to handle");
+        odebug << "do not really know how to handle" << oendl; 
         showUsernamePassword( false );
         showScriptWindow( false );
     }
 }
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp
index e3fab24..b75410c 100644
--- a/noncore/settings/networksettings/ppp/connect.cpp
+++ b/noncore/settings/networksettings/ppp/connect.cpp
@@ -471,9 +471,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
       if((unsigned) scriptindex < comlist->count()) {
         scriptCommand = *(comlist->at(scriptindex));
         scriptArgument = *(arglist->at(scriptindex));
       } else {
-       qDebug( "End of script" );
+       odebug << "End of script" << oendl; 
         vmain = 10;
         return;
       }
 
@@ -837,9 +837,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
 
       killTimer( main_timer_ID );
 
       if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000);
-      qDebug( "started if timeout timer with %i", _ifaceppp->data()->pppdTimeout()*1000);
+      odebug << "started if timeout timer with " << _ifaceppp->data()->pppdTimeout()*1000 << "" << oendl; 
 
       // find out PPP interface and notify the stats module
 //      stats->setUnit(pppInterfaceNumber());
 
@@ -847,9 +847,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
       semaphore = true;
       result = execppp();
 
       emit debugMessage(QObject::tr("Starting pppd..."));
-      qDebug("execppp() returned with return-code %i", result );
+      odebug << "execppp() returned with return-code " << result << "" << oendl; 
 
       if(result) {
         if(!_ifaceppp->data()->autoDNS())
           adddns( _ifaceppp );
@@ -1063,9 +1063,9 @@ void ConnectWidget::setExpect(const QString &n) {
 
 void ConnectWidget::if_waiting_timed_out() {
   if_timer->stop();
   if_timeout_timer->stop();
-  qDebug("if_waiting_timed_out()");
+  odebug << "if_waiting_timed_out()" << oendl; 
 
   _ifaceppp->data()->setpppdError(E_IF_TIMEOUT);
 
   // let's kill the stuck pppd
@@ -1270,9 +1270,9 @@ bool ConnectWidget::execppp() {
 
     return false; // nonsensically long command which would bust my buffer buf.
   }
 
-  qWarning("Command IS: %s",command.latin1() );
+  owarn << "Command IS: " << command.latin1() << "" << oendl; 
 
   qApp->flushX();
 
   return _ifaceppp->modem()->execPPPDaemon(command);
diff --git a/noncore/settings/networksettings/ppp/devices.cpp b/noncore/settings/networksettings/ppp/devices.cpp
index 9da090d..350ff32 100644
--- a/noncore/settings/networksettings/ppp/devices.cpp
+++ b/noncore/settings/networksettings/ppp/devices.cpp
@@ -71,13 +71,13 @@ DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *nam
   copy_b->setEnabled( false ); //FIXME
 //  delete_b->setEnabled( false ); //FIXME
 
   QStringList tmp = _pppdata->getDevicesNamesList();
-  qDebug("DevicesWidget::DevicesWidget got devices %s",tmp.join("--").latin1());
+  odebug << "DevicesWidget::DevicesWidget got devices " << tmp.join("--").latin1() << "" << oendl; 
   listListbox->insertStringList(tmp);
 
   for (uint i = 0; i < listListbox->count(); i++){
-      qDebug("listListbox->text(i) %s == _pppdata->devname() %s",listListbox->text(i).latin1(), _pppdata->devname().latin1());
+      odebug << "listListbox->text(i) " << listListbox->text(i).latin1() << " == _pppdata->devname() " << _pppdata->devname().latin1() << "" << oendl; 
       if ( listListbox->text(i) == _pppdata->devname() )
           listListbox->setCurrentItem( i );
   }
 }
diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp
index 81dab38..69bb682 100644
--- a/noncore/settings/networksettings/ppp/general.cpp
+++ b/noncore/settings/networksettings/ppp/general.cpp
@@ -334,9 +334,9 @@ bool ModemWidget::save()
     if(modemname->text().isEmpty() ||
             !_pppdata->isUniqueDevname(modemname->text()))
         return false;
 
-    qDebug("ModemWidget::save saving modem1 data");
+    odebug << "ModemWidget::save saving modem1 data" << oendl; 
     _pppdata->setDevname( modemname->text() );
     _pppdata->setModemDevice( modemdevice->currentText() );
     _pppdata->setFlowcontrol(flowcontrol->currentText());
     _pppdata->setFlowcontrol(flowcontrol->currentText());
diff --git a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp
index 6b158b9..5a76293 100644
--- a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp
+++ b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp
@@ -19,9 +19,9 @@
  */
 InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags f)
     :InterfaceInformationImp(parent, name, i, Qt::WStyle_ContextHelp)
 {
-    qDebug("InterfaceInformationPPP::InterfaceInformationPPP %s", name);
+    odebug << "InterfaceInformationPPP::InterfaceInformationPPP " << name << "" << oendl; 
     con = new ConnectWidget( (InterfacePPP*)i, this, "con" );
     con->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding,
                                     QSizePolicy::Fixed) );
 
diff --git a/noncore/settings/networksettings/ppp/interfaceppp.cpp b/noncore/settings/networksettings/ppp/interfaceppp.cpp
index f443f3c..5cc6f70 100644
--- a/noncore/settings/networksettings/ppp/interfaceppp.cpp
+++ b/noncore/settings/networksettings/ppp/interfaceppp.cpp
@@ -13,15 +13,15 @@ InterfacePPP::InterfacePPP(QObject *parent, const char *name, bool status)
     : Interface(parent, name, status),
       _modemPtr(0),
       _dataPtr(0)
 {
-    qDebug("InterfacePPP::InterfacePPP(");
+    odebug << "InterfacePPP::InterfacePPP(" << oendl; 
 }
 
 PPPData* InterfacePPP::data()const
 {
     if (!_dataPtr){
-        qDebug("creating new Data obj");
+        odebug << "creating new Data obj" << oendl; 
         _dataPtr = new PPPData();
         _dataPtr->setDevice( getInterfaceName() );
         _dataPtr->setAccount( getHardwareName() );
     }
@@ -30,17 +30,17 @@ PPPData* InterfacePPP::data()const
 
 Modem* InterfacePPP::modem()const
 {
     if (!_modemPtr){
-        qDebug("creating new modem obj");
+        odebug << "creating new modem obj" << oendl; 
         _modemPtr = new Modem( data() );
     }
     return _modemPtr;
 }
 
 bool InterfacePPP::refresh()
 {
-    qDebug("InterfacePPP::refresh()");
+    odebug << "InterfacePPP::refresh()" << oendl; 
     QString old = getInterfaceName();
     setInterfaceName( modem()->pppDevice() );
 
     (void)Interface::refresh();
@@ -52,9 +52,9 @@ bool InterfacePPP::refresh()
 }
 
 void InterfacePPP::start()
 {
-    qDebug("InterfacePPP::start");
+    odebug << "InterfacePPP::start" << oendl; 
 
     if (data()->password().isEmpty() && !data()->storedUsername().isEmpty() ) {
 
         QDialog mb( 0, "Dialog", true );
@@ -142,14 +142,14 @@ void InterfacePPP::start()
 //   emit updateInterface((Interface*) this);
 
   emit begin_connect();
 
-  qDebug("InterfacePPP::start END");
+  odebug << "InterfacePPP::start END" << oendl; 
 }
 
 void InterfacePPP::stop()
 {
-    qDebug("InterfacePPP::stop");
+    odebug << "InterfacePPP::stop" << oendl; 
     // emit hangup_now();
     status = false; // not connected
     setStatus( false );
     emit hangup_now();
diff --git a/noncore/settings/networksettings/ppp/kpppwidget.cpp b/noncore/settings/networksettings/ppp/kpppwidget.cpp
index e21bbc7..fd09332 100644
--- a/noncore/settings/networksettings/ppp/kpppwidget.cpp
+++ b/noncore/settings/networksettings/ppp/kpppwidget.cpp
@@ -73,15 +73,15 @@ KPPPWidget::KPPPWidget(PPPData*pd, Interface *i, QWidget *parent, const char *na
   p_kppp = this;
   // before doing anything else, run a few tests
     if (!_pppdata->setModemDevice( i->getInterfaceName() ))
         _pppdata->setModemDevice("/dev/modem");
-    qDebug("PPPConfigWidget::PPPConfigWidget");
-    qDebug(" interface->getHardwareName >%s<", i->getHardwareName().latin1());
+    odebug << "PPPConfigWidget::PPPConfigWidget" << oendl; 
+    odebug << " interface->getHardwareName >" << i->getHardwareName().latin1() << "<" << oendl; 
     if (!_pppdata->setAccount( i->getHardwareName() ))
         _pppdata->setAccount( 0 );
 
-    qDebug(" _pppdata->accname >%s<",_pppdata->accname().latin1());
-    qDebug(" _pppdata->currentAccountID() >%i<",_pppdata->currentAccountID());
+    odebug << " _pppdata->accname >" << _pppdata->accname().latin1() << "<" << oendl; 
+    odebug << " _pppdata->currentAccountID() >" << _pppdata->currentAccountID() << "<" << oendl; 
 
   int result = runTests();
   if(result == TEST_CRITICAL)
     exit(4);
@@ -304,9 +304,9 @@ KPPPWidget::~KPPPWidget()
 // bool KPPPWidget::eventFilter(QObject *o, QEvent *e) {
 //   if(e->type() == QEvent::User) {
 //     switch(((SignalEvent*)e)->sigType()) {
 //     case SIGINT:
-//       qDebug( "Received a SIGINT" );
+//       odebug << "Received a SIGINT" << oendl; 
 //       interruptConnection();
 //       break;
 //     case SIGCHLD:
 //       sigChld();
@@ -422,15 +422,15 @@ void KPPPWidget::interruptConnection() {
 }
 
 
 void KPPPWidget::sigPPPDDied() {
-    qDebug( "Received a SIGUSR1" );
+    odebug << "Received a SIGUSR1" << oendl; 
 
     // if we are not connected pppdpid is -1 so have have to check for that
     // in the followin line to make sure that we don't raise a false alarm
     // such as would be the case when the log file viewer exits.
     if(_pppdata->pppdRunning() || _pppdata->pppdError()) {
-        qDebug( "It was pppd that died" );
+        odebug << "It was pppd that died" << oendl; 
 
         // when we killpppd() on Cancel in ConnectWidget
         // we set pppid to -1 so we won't
         // enter this block
@@ -441,9 +441,9 @@ void KPPPWidget::sigPPPDDied() {
         Modem::modem->removeSecret(AUTH_CHAP);
 
         _pppdata->setpppdRunning(false);
 
-        qDebug( "Executing command on disconnect since pppd has died." );
+        odebug << "Executing command on disconnect since pppd has died." << oendl; 
         QApplication::flushX();
         execute_command(_pppdata->command_on_disconnect());
 
 //      stopAccounting();
@@ -488,9 +488,9 @@ void KPPPWidget::sigPPPDDied() {
         // if(QMessageBox::warning(0, msg, QObject::tr("Error"), QObject::tr("&OK"), QObject::tr("&Details...")) == QMessageBox::No)
         // //  PPPL_ShowLog();
 //       } else { /* reconnect on disconnect */
             if (false){
-                qDebug( "Trying to reconnect... " );
+                odebug << "Trying to reconnect... " << oendl; 
 
                 if(_pppdata->authMethod() == AUTH_PAP ||
                    _pppdata->authMethod() == AUTH_CHAP ||
                    _pppdata->authMethod() == AUTH_PAPCHAP)
@@ -510,9 +510,9 @@ void KPPPWidget::sigPPPDDied() {
     }
 }
 
 // void KPPPWidget::sigChld() {
-//   qDebug( "sigchld()" );
+//   odebug << "sigchld()" << oendl; 
 //   //  pid_t id = wait(0L);
 //   //  if(id == helperPid && helperPid != -1) {
 //   //    kdDebug(5002) << "It was the setuid child that died" << endl;
 //  // helperPid = -1;
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp
index 3dbc8c3..f3f2639 100644
--- a/noncore/settings/networksettings/ppp/modem.cpp
+++ b/noncore/settings/networksettings/ppp/modem.cpp
@@ -54,9 +54,9 @@
 #define qError qDebug
 
 
 #define MY_ASSERT(x)  if (!(x)) { \
-        qFatal( "ASSERT: \"%s\" in %s (%d)\n",#x,__FILE__,__LINE__); \
+        ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl;  \
         exit(1); }
 
 
 static sigjmp_buf jmp_buffer;
@@ -164,9 +164,9 @@ bool Modem::opentty() {
 //begin  if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) {
     close(modemfd);
     device = _pppdata->modemDevice();
     if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) {
-        qDebug("error opening modem device !");
+        odebug << "error opening modem device !" << oendl; 
         errmsg = QObject::tr("Unable to open modem.");
         return false;
     }
 //bend  if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) {
@@ -305,11 +305,11 @@ void Modem::startNotifier() {
   if(modemfd >= 0) {
     if(sn == 0) {
       sn = new QSocketNotifier(modemfd, QSocketNotifier::Read, this);
       connect(sn, SIGNAL(activated(int)), SLOT(readtty(int)));
-      qDebug("QSocketNotifier started!");
+      odebug << "QSocketNotifier started!" << oendl; 
     } else {
-        qDebug("QSocketNotifier re-enabled!");
+        odebug << "QSocketNotifier re-enabled!" << oendl; 
         sn->setEnabled(true);
     }
   }
 }
@@ -320,9 +320,9 @@ void Modem::stopNotifier() {
     sn->setEnabled(false);
     disconnect(sn);
     delete sn;
     sn = 0;
-    qDebug( "QSocketNotifier stopped!" );
+    odebug << "QSocketNotifier stopped!" << oendl; 
   }
 }
 
 
@@ -336,9 +336,9 @@ bool Modem::writeChar(unsigned char c) {
   int s;
   do {
     s = write(modemfd, &c, 1);
     if (s < 0) {
-      qError( "write() in Modem::writeChar failed" );
+      oerr << "write() in Modem::writeChar failed" << oendl; 
       return false;
     }
   } while(s == 0);
 
@@ -364,9 +364,9 @@ bool Modem::writeLine(const char *buf) {
   while(l) {
     int wr = write(modemfd, &b[len-l], l);
     if(wr < 0) {
       // TODO do something meaningful with the error code (or ignore it
-      qError( "write() in Modem::writeLine failed" );
+      oerr << "write() in Modem::writeLine failed" << oendl; 
       delete[] b;
       return false;
     }
     l -= wr;
@@ -473,9 +473,9 @@ QString Modem::parseModemSpeed(const QString &s) {
   int tx = -1;
   int i;
   QString result;
 
-  qDebug( "Modem reported result string: %s", s.latin1());
+  odebug << "Modem reported result string: " << s.latin1() << "" << oendl; 
 
   const int RXMAX = 7;
   const int TXMAX = 2;
   QRegExp rrx[RXMAX] = {
@@ -559,9 +559,9 @@ QString Modem::parseModemSpeed(const QString &s) {
     result.setNum(tx);
   else
     result.sprintf("%d/%d", rx, tx);
 
-  qDebug( "The parsed result is: %s", result.latin1());
+  odebug << "The parsed result is: " << result.latin1() << "" << oendl; 
 
   return result;
 }
 
@@ -572,9 +572,9 @@ int Modem::lockdevice() {
   int fd;
   char newlock[80]=""; // safe
 
   if(!_pppdata->modemLockFile()) {
-    qDebug("The user doesn't want a lockfile.");
+    odebug << "The user doesn't want a lockfile." << oendl; 
     return 0;
   }
 
   if (modem_is_locked)
@@ -594,9 +594,9 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
       if (sz <= 0)
         return 1;
       oldlock[sz] = '\0';
 
-      qDebug( "Device is locked by: %s", oldlock);
+      odebug << "Device is locked by: " << oldlock << "" << oendl; 
 
       int oldpid;
       int match = sscanf(oldlock, "%d", &oldpid);
 
@@ -607,16 +607,16 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
       // check if process exists
       if (kill((pid_t)oldpid, 0) == 0 || errno != ESRCH)
         return 1;
 
-      qDebug( "lockfile is stale" );
+      odebug << "lockfile is stale" << oendl; 
     }
   }
 
   fd = openLockfile(_pppdata->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT);
   if(fd >= 0) {
     sprintf(newlock,"%010d\n", getpid());
-    qDebug("Locking Device: %s", newlock);
+    odebug << "Locking Device: " << newlock << "" << oendl; 
 
     write(fd, newlock, strlen(newlock));
     close(fd);
     modem_is_locked=true;
@@ -631,9 +631,9 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
 
 // UnLock modem device
 void Modem::unlockdevice() {
   if (modem_is_locked) {
-    qDebug( "UnLocking Modem Device" );
+    odebug << "UnLocking Modem Device" << oendl; 
     close(modemfd);
     modemfd = -1;
     unlink(lockfile);
     lockfile[0] = '\0';
@@ -653,9 +653,9 @@ int Modem::openLockfile( QString lockfile, int flags)
 
     lockfile = LOCK_DIR;
     lockfile += "/LCK..";
     lockfile += device.right( device.length() - device.findRev("/") -1 );
-    qDebug("lockfile >%s<",lockfile.latin1());
+    odebug << "lockfile >" << lockfile.latin1() << "<" << oendl; 
     // TODO:
     //   struct stat st;
     //   if(stat(lockfile.data(), &st) == -1) {
     //     if(errno == EBADF)
@@ -665,9 +665,9 @@ int Modem::openLockfile( QString lockfile, int flags)
     //     if(!S_ISREG(st.st_mode))
     //       return -1;
     //   }
     if ((fd = open(lockfile, flags, mode)) == -1) {
-        qDebug("error opening lockfile!");
+        odebug << "error opening lockfile!" << oendl; 
         lockfile = QString::null;
         fd = open(DEVNULL, O_RDONLY);
     } else
         fchown(fd, 0, 0);
@@ -926,17 +926,17 @@ bool Modem::execpppd(const char *arguments) {
       _exit(0);
       break;
 
     default:
-      qDebug("In parent: pppd pid %d\n",pppdPid);
+      odebug << "In parent: pppd pid " << pppdPid << "\n" << oendl; 
       close(modemfd);
 
       ::close( m_pppdLOG[1] );
       // set it to nonblocking io
       int flag = ::fcntl( m_pppdLOG[0], F_GETFL );
 
       if ( !(flag & O_NONBLOCK) ) {
-          qDebug("Setting nonblocking io");
+          odebug << "Setting nonblocking io" << oendl; 
           flag |= O_NONBLOCK;
           ::fcntl(m_pppdLOG[0], F_SETFL, flag );
       }
 
@@ -953,17 +953,17 @@ bool Modem::execpppd(const char *arguments) {
 }
 
 
 bool Modem::killpppd() {
-    qDebug("In killpppd and pid is %d", pppdPid );
+    odebug << "In killpppd and pid is " << pppdPid << "" << oendl; 
   if(pppdPid > 0) {
     delete m_modemDebug;
     m_modemDebug = 0;
-    qDebug("In killpppd(): Sending SIGTERM to %d\n", pppdPid);
+    odebug << "In killpppd(): Sending SIGTERM to " << pppdPid << "\n" << oendl; 
     if(kill(pppdPid, SIGTERM) < 0) {
-      qDebug("Error terminating %d. Sending SIGKILL\n", pppdPid);
+      odebug << "Error terminating " << pppdPid << ". Sending SIGKILL\n" << oendl; 
       if(kill(pppdPid, SIGKILL) < 0) {
-        qDebug("Error killing %d\n", pppdPid);
+        odebug << "Error killing " << pppdPid << "\n" << oendl; 
         return false;
       }
     }
   }
@@ -1034,9 +1034,9 @@ int Modem::pppdExitStatus()
 int Modem::openResolv(int flags)
 {
     int fd;
     if ((fd = open(_PATH_RESCONF, flags)) == -1) {
-        qDebug("error opening resolv.conf!");
+        odebug << "error opening resolv.conf!" << oendl; 
         fd = open(DEVNULL, O_RDONLY);
     }
     return fd;
 }
@@ -1055,9 +1055,9 @@ void Modem::setPPPDevice( const QString& dev ) {
 pid_t Modem::pppPID()const {
     return pppdPid;
 }
 void Modem::setPPPDPid( pid_t pid ) {
-    qDebug("Modem setting pid");
+    odebug << "Modem setting pid" << oendl; 
     _pppdExitStatus = -1;
     pppdPid = pid;
     modemfd = -1;
 }
diff --git a/noncore/settings/networksettings/ppp/pppconfig.cpp b/noncore/settings/networksettings/ppp/pppconfig.cpp
index 97baf31..a8c99fd 100644
--- a/noncore/settings/networksettings/ppp/pppconfig.cpp
+++ b/noncore/settings/networksettings/ppp/pppconfig.cpp
@@ -24,12 +24,12 @@ PPPConfigWidget::PPPConfigWidget( InterfacePPP* iface, QWidget *parent,
         return;
     }
 
     interface = iface;
-    qDebug("PPPConfigWidget::PPPConfigWidget");
-    qDebug(" interface->getHardwareName >%s<", interface->getHardwareName().latin1());
+    odebug << "PPPConfigWidget::PPPConfigWidget" << oendl; 
+    odebug << " interface->getHardwareName >" << interface->getHardwareName().latin1() << "<" << oendl; 
 
-    qDebug(" _pppdata->accname >%s<",interface->data()->accname().latin1());
+    odebug << " _pppdata->accname >" << interface->data()->accname().latin1() << "<" << oendl; 
 
 
   QVBoxLayout *layout = new QVBoxLayout( this );
   layout->setSpacing( 0 );
@@ -57,11 +57,11 @@ PPPConfigWidget::~PPPConfigWidget()
 }
 
 void PPPConfigWidget::accept()
 {
-    qDebug("PPPConfigWidget::accept");
-    qDebug(" _pppdata->accname >%s<",interface->data()->accname().latin1());
-    qDebug(" interface->getHardwareName >%s<", interface->getHardwareName().latin1());
+    odebug << "PPPConfigWidget::accept" << oendl; 
+    odebug << " _pppdata->accname >" << interface->data()->accname().latin1() << "<" << oendl; 
+    odebug << " interface->getHardwareName >" << interface->getHardwareName().latin1() << "<" << oendl; 
     interface->setInterfaceName( interface->data()->devname() );
     interface->setHardwareName( interface->data()->accname() );
     interface->save();
     QDialog::accept();
diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp
index f4727c1..567ccf8 100644
--- a/noncore/settings/networksettings/ppp/pppdata.cpp
+++ b/noncore/settings/networksettings/ppp/pppdata.cpp
@@ -55,10 +55,10 @@ PPPData::PPPData()
   Config cfg = config();
   cfg.setGroup(GENERAL_GRP);
   accountList = cfg.readListEntry(ACCOUNT_LIST, ',' );
   deviceList = cfg.readListEntry(DEVICESNAMES_LIST, ',' );
-  qDebug("PPPData::PPPData has a accountList %s", accountList.join("---").latin1());
-  qDebug("PPPData::PPPData has a deviceList %s", deviceList.join("---").latin1());
+  odebug << "PPPData::PPPData has a accountList " << accountList.join("---").latin1() << "" << oendl; 
+  odebug << "PPPData::PPPData has a deviceList " << deviceList.join("---").latin1() << "" << oendl; 
 
 //   if (highcount > MAX_ACCOUNTS)
 //     highcount = MAX_ACCOUNTS;
 
@@ -85,9 +85,9 @@ Config PPPData::config()
 // save configuration
 //
 void PPPData::save()
 {
-    qDebug("PPPData saving data");
+    odebug << "PPPData saving data" << oendl; 
     writeConfig(GENERAL_GRP, NUMACCOUNTS_KEY, count());
     writeConfig(GENERAL_GRP, NUMDEVICES_KEY, highcountdev + 1);
     QString key;
     QStringList keys;
@@ -99,30 +99,30 @@ void PPPData::save()
     for( QMap<QString,QString>::Iterator it = stringEntries.begin();
          it != stringEntries.end(); ++it ){
         QString val = it.data();
         key = it.key();
-//        qDebug("saving %s -> %s", key.latin1(), val.latin1() );
+//        odebug << "saving " << key.latin1() << " -> " << val.latin1() << "" << oendl; 
         keys = QStringList::split( "SEPARATOR", key );
-        //qDebug("group >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.latin1() );
+        //odebug << "group >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.latin1() << "<" << oendl; 
         cfg.setGroup(keys[0]);
         cfg.writeEntry(keys[1], val);
      }
     for( QMap<QString,int>::Iterator it = intEntries.begin();
          it != intEntries.end(); ++it ){
         int val = it.data();
         key = it.key();
-//        qDebug("saving %s -> %i", key.latin1(), val );
+//        odebug << "saving " << key.latin1() << " -> " << val << "" << oendl; 
         keys = QStringList::split( "SEPARATOR", key );
-        //qDebug("group >%s< key >%s< val %i", keys[0].latin1(), keys[1].latin1(), val );
+        //odebug << "group >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< val " << val << "" << oendl; 
         cfg.setGroup(keys[0]);
         cfg.writeEntry(keys[1], val);
      }
     for( QMap<QString,QStringList>::Iterator it = listEntries.begin();
          it != listEntries.end(); ++it ){
         QStringList val = it.data();
         key = it.key();
         QChar sep = sepEntries[key];
-//        qDebug("saving %s -> %s", key.latin1(), val.join(sep).latin1() );
+//        odebug << "saving " << key.latin1() << " -> " << val.join(sep).latin1() << "" << oendl; 
         keys = QStringList::split( "SEPARATOR", key );
         cfg.setGroup(keys[0]);
         cfg.writeEntry(keys[1], val, sep);
      }
@@ -141,9 +141,9 @@ void PPPData::cancel() {
 // functions to read/write date to configuration file
 QString PPPData::readConfig(const QString &group, const QString &key,
                             const QString &defvalue = "")
 {
-//    qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1());
+//    odebug << "PPPData::readConfig key >" << key.latin1() << "< group >" << group.latin1() << "<" << oendl; 
     QString idx = SEP.arg(group).arg(key);
     if (stringEntries.find(idx) != stringEntries.end())
         return stringEntries[idx];
     Config cfg = config();
@@ -364,23 +364,23 @@ const QString PPPData::modemDevice() {
 //     return readConfig(modemGroup(), MODEMNAME_KEY);
 // }
 
 // bool PPPData::setModemName(const QString &n) {
-//     qDebug("Setting modem name to >%s<", n.latin1());
+//     odebug << "Setting modem name to >" << n.latin1() << "<" << oendl; 
 //     _modemName = n;
 //     writeConfig(cgroup, MODEMNAME_KEY, n);
 //     return true; //FIXME
 // }
 
 // bool PPPData::changeModemName(const QString &n) {
-//     qDebug("Setting modem name to >%s<", n.latin1());
+//     odebug << "Setting modem name to >" << n.latin1() << "<" << oendl; 
 //     _modemName = n;
 //     writeConfig(modemGroup(), MODEMNAME_KEY, n);
 //     return true; //FIXME
 // }
 
 bool PPPData::setModemDevice(const QString &n) {
-    qDebug("Setting modem dev to >%s<", n.latin1());
+    odebug << "Setting modem dev to >" << n.latin1() << "<" << oendl; 
     writeConfig(modemGroup(), MODEMDEV_KEY, n);
     return true; //FIXME
 }
 
@@ -738,20 +738,20 @@ int PPPData::count() const {
 }
 
 
 bool PPPData::setAccount(const QString &aname) {
-    qDebug("setting account to >%s<", aname.latin1());
+    odebug << "setting account to >" << aname.latin1() << "<" << oendl; 
     for ( QStringList::Iterator it = accountList.begin(); it != accountList.end(); ++it ) {
         cgroup = *it;
-        qDebug("PPPData::setAccount %s", cgroup.latin1());
-        qDebug( "iterator %s", (*it).latin1() );
+        odebug << "PPPData::setAccount " << cgroup.latin1() << "" << oendl; 
+        odebug << "iterator " << (*it).latin1() << "" << oendl; 
         if(accname() == aname) {
-            qDebug("SUCCESS");
+            odebug << "SUCCESS" << oendl; 
             return true;
         }
 
     }
-    qDebug("FAILURE");
+    odebug << "FAILURE" << oendl; 
     return false;
 }
 
 /*
@@ -771,13 +771,13 @@ bool PPPData::setAccountbyIndex(int i) {
 bool PPPData::isUniqueAccname(const QString &n) {
   QString save_cgroup = cgroup;
   for ( QStringList::Iterator it = accountList.begin(); it != accountList.end(); ++it ) {
       cgroup = *it;
-      qDebug("PPPData::setAccount %s", cgroup.latin1());
-      qDebug( "%s \n", (*it).latin1() );
+      odebug << "PPPData::setAccount " << cgroup.latin1() << "" << oendl; 
+      odebug << "" << (*it).latin1() << " \n" << oendl; 
       if(accname() == n && cgroup != save_cgroup) {
           cgroup = save_cgroup;
-          qDebug("SUCCESS");
+          odebug << "SUCCESS" << oendl; 
           return false;
       }
 
   }
@@ -787,15 +787,15 @@ bool PPPData::isUniqueAccname(const QString &n) {
 
 
 bool PPPData::isUniqueDevname(const QString &n) {
     QString save_mName = _modemName;
-    qDebug("PPPData::isUniqueDevname checking if %s is unique", n.latin1());
+    odebug << "PPPData::isUniqueDevname checking if " << n.latin1() << " is unique" << oendl; 
     for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) {
         _modemName = *it;
-        qDebug("PPPData::isUniqueDevname %s == %s", n.latin1() , devname().latin1());
+        odebug << "PPPData::isUniqueDevname " << n.latin1() << " == " << devname().latin1() << "" << oendl; 
         if(devname() == n && _modemName != save_mName) {
             _modemName = save_mName;
-            qDebug("NOT UNIQUE");
+            odebug << "NOT UNIQUE" << oendl; 
             return false;
         }
 
     }
@@ -819,9 +819,9 @@ bool PPPData::deleteAccount() {
         key = it.key();
         keys = QStringList::split( "SEPARATOR", key );
         if(keys[0]==cgroup){
             stringEntries.remove( it );
-            qDebug("deleting >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.latin1() );
+            odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.latin1() << "<" << oendl; 
         }
     }
     for( QMap<QString,int>::Iterator it = intEntries.begin();
          it != intEntries.end(); ++it ){
@@ -829,9 +829,9 @@ bool PPPData::deleteAccount() {
         key = it.key();
         keys = QStringList::split( "SEPARATOR", key );
         if(keys[0]==cgroup){
             intEntries.remove( it );
-            qDebug("deleting >%s< key >%s< value >%i<", keys[0].latin1(), keys[1].latin1(), val );
+            odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val << "<" << oendl; 
         }
     }
     for( QMap<QString,QStringList>::Iterator it = listEntries.begin();
          it != listEntries.end(); ++it ){
@@ -839,9 +839,9 @@ bool PPPData::deleteAccount() {
         key = it.key();
         if(keys[0]==cgroup){
             listEntries.remove( it );
             sepEntries.remove( key );
-            qDebug("deleting >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.join("").latin1() );
+            odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.join("").latin1() << "<" << oendl; 
         }
     }
 
     return true;
@@ -859,18 +859,18 @@ bool PPPData::deleteAccount(const QString &aname) {
 
 
 int PPPData::newaccount() {
 
-    qDebug("PPPData::newaccount highcount %i/%i",highcount,MAX_ACCOUNTS);
+    odebug << "PPPData::newaccount highcount " << highcount << "/" << MAX_ACCOUNTS << "" << oendl; 
 //  if(!config) open();
 //  if (highcount >= MAX_ACCOUNTS) return -1;
 
 
   QString tmp;
   tmp.sprintf("%s%i", ACCOUNT_GRP, ++highcount);
   cgroup = QString(tmp);
   accountList << tmp;
-  qDebug("PPPData::newaccount() Group: >%s<",cgroup.latin1());
+  odebug << "PPPData::newaccount() Group: >" << cgroup.latin1() << "<" << oendl; 
   setpppdArgumentDefaults();
   return highcount;
 }
 
@@ -964,11 +964,11 @@ void PPPData::setStoredUsername(const QString &b) {
 }
 
 
 const QString  PPPData::storedPassword() {
-    qDebug("getting stored pw");
-    qDebug("g %s", cgroup.latin1() );
-    qDebug("k %s", STORED_PASSWORD_KEY);
+    odebug << "getting stored pw" << oendl; 
+    odebug << "g " << cgroup.latin1() << "" << oendl; 
+    odebug << "k " << STORED_PASSWORD_KEY << "" << oendl; 
   return readConfig(cgroup, STORED_PASSWORD_KEY, "");
 }
 
 
@@ -1328,12 +1328,12 @@ void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces )
     for( it = ifaces.begin(); it != ifaces.end(); ++it ){
         cfg.setGroup(QString("%1_%1").arg(ACCLIST_GRP).arg(i++));
         cfg.writeEntry( ACOUNTS_DEV, it.key() );
         cfg.writeEntry( ACOUNTS_ACC, it.data() );
-        qDebug("I %i",i);
+        odebug << "I " << i << "" << oendl; 
     }
     cfg.setGroup( ACCLIST_GRP );
-    qDebug("saved %i account settings", i);
+    odebug << "saved " << i << " account settings" << oendl; 
     cfg.writeEntry( ACCOUNTS_COUNT, i );
 
 }
 
@@ -1371,9 +1371,9 @@ QStringList PPPData::getAccountList()
 
 const QString PPPData::devname()
 {
     QString tmp = readConfig(modemGroup(), MODEMNAME_KEY );
-    qDebug("PPPData::devname() of %s is %s", modemGroup().latin1(), tmp.latin1());
+    odebug << "PPPData::devname() of " << modemGroup().latin1() << " is " << tmp.latin1() << "" << oendl; 
     return tmp;
 }
 
 void PPPData::setDevname(const QString &n) {
@@ -1389,22 +1389,22 @@ void PPPData::setDevname(const QString &n) {
 
 
 bool PPPData::setDevice(const QString &dev )
 {
-    qDebug("setting device to >%s<", dev.latin1());
+    odebug << "setting device to >" << dev.latin1() << "<" << oendl; 
     QString save_mName = _modemName;
     for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) {
         _modemName = *it;
-        qDebug("PPPData::setDevice %s is named %s", _modemName.latin1(), devname().latin1() );
-        qDebug( "iterator %s", (*it).latin1() );
+        odebug << "PPPData::setDevice " << _modemName.latin1() << " is named " << devname().latin1() << "" << oendl; 
+        odebug << "iterator " << (*it).latin1() << "" << oendl; 
         if(devname() == dev) {
-            qDebug("SUCCESS");
+            odebug << "SUCCESS" << oendl; 
             return true;
         }
 
     }
     _modemName = save_mName;
-    qDebug("FAILURE");
+    odebug << "FAILURE" << oendl; 
     return false;
 }
 
 bool PPPData::deleteDevice()
@@ -1423,9 +1423,9 @@ bool PPPData::deleteDevice()
         key = it.key();
         keys = QStringList::split( "SEPARATOR", key );
         if(keys[0]==modemGroup()){
             stringEntries.remove( it );
-            qDebug("deleting >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.latin1() );
+            odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.latin1() << "<" << oendl; 
         }
     }
     for( QMap<QString,int>::Iterator it = intEntries.begin();
          it != intEntries.end(); ++it ){
@@ -1433,9 +1433,9 @@ bool PPPData::deleteDevice()
         key = it.key();
         keys = QStringList::split( "SEPARATOR", key );
         if(keys[0]==modemGroup()){
             intEntries.remove( it );
-            qDebug("deleting >%s< key >%s< value >%i<", keys[0].latin1(), keys[1].latin1(), val );
+            odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val << "<" << oendl; 
         }
     }
     for( QMap<QString,QStringList>::Iterator it = listEntries.begin();
          it != listEntries.end(); ++it ){
@@ -1443,9 +1443,9 @@ bool PPPData::deleteDevice()
         key = it.key();
         if(keys[0]==modemGroup()){
             listEntries.remove( it );
             sepEntries.remove( key );
-            qDebug("deleting >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.join("").latin1() );
+            odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.join("").latin1() << "<" << oendl; 
         }
     }
 
     return true;
@@ -1462,16 +1462,16 @@ bool PPPData::deleteDevice(const QString &dev)
 
 int PPPData::newdevice()
 {
 
-    qDebug("PPPData::newdevice highcount %i",highcountdev);
+    odebug << "PPPData::newdevice highcount " << highcountdev << "" << oendl; 
 
 
   QString tmp;
   tmp.sprintf("%s%i", MODEM_GRP, ++highcountdev);
   _modemName = QString(tmp);
   deviceList << tmp;
-  qDebug("PPPData::newdevice() Group: >%s<",cgroup.latin1());
+  odebug << "PPPData::newdevice() Group: >" << cgroup.latin1() << "<" << oendl; 
   return highcountdev;
 }
 
 int PPPData::copydevice(const QString&)
@@ -1483,12 +1483,12 @@ int PPPData::copydevice(const QString&)
 QStringList PPPData::getDevicesNamesList()
 {
     QStringList list;
     QString save_mName = _modemName;
-    qDebug("PPPData::getDevicesNamesList has  %s", deviceList.join("---").latin1());
+    odebug << "PPPData::getDevicesNamesList has  " << deviceList.join("---").latin1() << "" << oendl; 
     for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) {
         _modemName = *it;
-        qDebug("PPPData::getDevicesNamesList adding %s as %s",_modemName.latin1(), devname().latin1());
+        odebug << "PPPData::getDevicesNamesList adding " << _modemName.latin1() << " as " << devname().latin1() << "" << oendl; 
         list << devname();
     }
     _modemName = save_mName;
     return list;
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp
index a7caffe..2291e8a 100644
--- a/noncore/settings/networksettings/ppp/pppmodule.cpp
+++ b/noncore/settings/networksettings/ppp/pppmodule.cpp
@@ -59,20 +59,20 @@ PPPModule::PPPModule() : Module()
 
     QMap<QString,QString> ifaces = PPPData::getConfiguredInterfaces();
     QMap<QString,QString>::Iterator it;
     InterfacePPP *iface;
-    qDebug("getting interfaces");
+    odebug << "getting interfaces" << oendl; 
     for( it = ifaces.begin(); it != ifaces.end(); ++it )
     {
-        qDebug("ifaces %s %s", it.key().latin1(), it.data().latin1() );
+        odebug << "ifaces " << it.key().latin1() << " " << it.data().latin1() << "" << oendl; 
         iface = new InterfacePPP( 0, it.key() );
         iface->setHardwareName( it.data() );
         list.append( (Interface*)iface );
 
         // check if (*it) is one of the running ifaces
         if ( running.contains( it.data() ) )
         {
-            qDebug("iface is running %s", it.key().latin1() );
+            odebug << "iface is running " << it.key().latin1() << "" << oendl; 
             handledInterfaceNames << running[it.data()].device;
             iface->setStatus( true );
             iface->setPPPDpid( running[it.data()].pid );
             iface->modem()->setPPPDevice( running[it.data()].device );
@@ -87,18 +87,18 @@ PPPModule::PPPModule() : Module()
  * Delete any interfaces that we own.
  */
 PPPModule::~PPPModule()
 {
-    qDebug("PPPModule::~PPPModule() " );
+    odebug << "PPPModule::~PPPModule() " << oendl; 
     QMap<QString,QString> ifaces;
     InterfaceKeeper keeper;
     Interface *i;
     for ( i=list.first(); i != 0; i=list.next() )
     {
         /* if online save the state */
         if ( i->getStatus() )
         {
-            qDebug("Iface %s is still up", i->getHardwareName().latin1() );
+            odebug << "Iface " << i->getHardwareName().latin1() << " is still up" << oendl; 
             InterfacePPP* ppp = static_cast<InterfacePPP*>(i);
             keeper.addInterface( ppp->pppPID(), ppp->pppDev(), ppp->getHardwareName() );
         }
         ifaces.insert( i->getInterfaceName(), i->getHardwareName() );
@@ -140,9 +140,9 @@ bool PPPModule::isOwner(Interface *i)
  * @return QWidget* pointer to this modules configure.
  */
 QWidget *PPPModule::configure(Interface *i)
 {
-    qDebug("return ModemWidget");
+    odebug << "return ModemWidget" << oendl; 
     PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i,
                                  0, "PPPConfig", false,
                                  (Qt::WDestructiveClose | Qt::WStyle_ContextHelp));
     return pppconfig;
@@ -167,9 +167,9 @@ QWidget *PPPModule::information(Interface *i)
  */
 QList<Interface> PPPModule::getInterfaces()
 {
     // List all of the files in the peer directory
-    qDebug("PPPModule::getInterfaces");
+    odebug << "PPPModule::getInterfaces" << oendl; 
     return list;
 }
 
 /**
@@ -260,9 +260,9 @@ namespace
             cfg.setGroup( (*it) );
             con.name = (*it);
             con.pid = cfg.readNumEntry("pid");
             con.device = cfg.readEntry("device");
-            qDebug(" %s %s %d", con.name.latin1(), con.device.latin1(),  con.pid );
+            odebug << " " << con.name.latin1() << " " << con.device.latin1() << " " << con.pid << "" << oendl; 
 
             if ( con.pid != -1 && isAvailable( con.pid ) )
                 ifaces.insert( con.name, con );
         }
@@ -271,13 +271,13 @@ namespace
     bool InterfaceKeeper::isAvailable( pid_t p)const
     {
         if (::kill(p, 0 ) == 0 || errno != ESRCH )
         {
-            qDebug("isAvailable %d",  p);
+            odebug << "isAvailable " << p << "" << oendl; 
             return true;
         }
 
-        qDebug("notAvailable %d", p);
+        odebug << "notAvailable " << p << "" << oendl; 
         return false;
     }
 
 }