convert to Opie Debugging Framework

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
@@ -120,3 +120,3 @@ void AccountWidget::create()
     {
-        qDebug("_pppdata->newaccount() == -1");
+        odebug << "_pppdata->newaccount() == -1" << oendl; 
         return;
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
@@ -144,3 +144,3 @@ void AuthWidget::authChanged( const QString &authStr )
 {
-    qDebug("AuthWidget::authChanged( %s )", authStr.latin1() );
+    odebug << "AuthWidget::authChanged( " << authStr.latin1() << " )" << oendl; 
     if ( authStr.contains( tr("Script-based") ) ){
@@ -153,3 +153,3 @@ void AuthWidget::authChanged( const QString &authStr )
     } else {
-        qDebug("do not really know how to handle");
+        odebug << "do not really know how to handle" << oendl; 
         showUsernamePassword( 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
@@ -474,3 +474,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
       } else {
-       qDebug( "End of script" );
+       odebug << "End of script" << oendl; 
         vmain = 10;
@@ -840,3 +840,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
       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; 
 
@@ -850,3 +850,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
       emit debugMessage(QObject::tr("Starting pppd..."));
-      qDebug("execppp() returned with return-code %i", result );
+      odebug << "execppp() returned with return-code " << result << "" << oendl; 
 
@@ -1066,3 +1066,3 @@ void ConnectWidget::if_waiting_timed_out() {
   if_timeout_timer->stop();
-  qDebug("if_waiting_timed_out()");
+  odebug << "if_waiting_timed_out()" << oendl; 
 
@@ -1273,3 +1273,3 @@ bool ConnectWidget::execppp() {
 
-  qWarning("Command IS: %s",command.latin1() );
+  owarn << "Command IS: " << command.latin1() << "" << oendl; 
 
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
@@ -74,3 +74,3 @@ DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *nam
   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);
@@ -78,3 +78,3 @@ DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *nam
   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() )
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
@@ -337,3 +337,3 @@ bool ModemWidget::save()
 
-    qDebug("ModemWidget::save saving modem1 data");
+    odebug << "ModemWidget::save saving modem1 data" << oendl; 
     _pppdata->setDevname( modemname->text() );
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
@@ -22,3 +22,3 @@ InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *na
 {
-    qDebug("InterfaceInformationPPP::InterfaceInformationPPP %s", name);
+    odebug << "InterfaceInformationPPP::InterfaceInformationPPP " << name << "" << oendl; 
     con = new ConnectWidget( (InterfacePPP*)i, this, "con" );
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
@@ -16,3 +16,3 @@ InterfacePPP::InterfacePPP(QObject *parent, const char *name, bool status)
 {
-    qDebug("InterfacePPP::InterfacePPP(");
+    odebug << "InterfacePPP::InterfacePPP(" << oendl; 
 }
@@ -22,3 +22,3 @@ PPPData* InterfacePPP::data()const
     if (!_dataPtr){
-        qDebug("creating new Data obj");
+        odebug << "creating new Data obj" << oendl; 
         _dataPtr = new PPPData();
@@ -33,3 +33,3 @@ Modem* InterfacePPP::modem()const
     if (!_modemPtr){
-        qDebug("creating new modem obj");
+        odebug << "creating new modem obj" << oendl; 
         _modemPtr = new Modem( data() );
@@ -41,3 +41,3 @@ bool InterfacePPP::refresh()
 {
-    qDebug("InterfacePPP::refresh()");
+    odebug << "InterfacePPP::refresh()" << oendl; 
     QString old = getInterfaceName();
@@ -55,3 +55,3 @@ void InterfacePPP::start()
 {
-    qDebug("InterfacePPP::start");
+    odebug << "InterfacePPP::start" << oendl; 
 
@@ -145,3 +145,3 @@ void InterfacePPP::start()
 
-  qDebug("InterfacePPP::start END");
+  odebug << "InterfacePPP::start END" << oendl; 
 }
@@ -150,3 +150,3 @@ void InterfacePPP::stop()
 {
-    qDebug("InterfacePPP::stop");
+    odebug << "InterfacePPP::stop" << oendl; 
     // 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
@@ -76,4 +76,4 @@ KPPPWidget::KPPPWidget(PPPData*pd, Interface *i, QWidget *parent, const char *na
         _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() ))
@@ -81,4 +81,4 @@ KPPPWidget::KPPPWidget(PPPData*pd, Interface *i, QWidget *parent, const char *na
 
-    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; 
 
@@ -307,3 +307,3 @@ KPPPWidget::~KPPPWidget()
 //     case SIGINT:
-//       qDebug( "Received a SIGINT" );
+//       odebug << "Received a SIGINT" << oendl; 
 //       interruptConnection();
@@ -425,3 +425,3 @@ void KPPPWidget::interruptConnection() {
 void KPPPWidget::sigPPPDDied() {
-    qDebug( "Received a SIGUSR1" );
+    odebug << "Received a SIGUSR1" << oendl; 
 
@@ -431,3 +431,3 @@ void KPPPWidget::sigPPPDDied() {
     if(_pppdata->pppdRunning() || _pppdata->pppdError()) {
-        qDebug( "It was pppd that died" );
+        odebug << "It was pppd that died" << oendl; 
 
@@ -444,3 +444,3 @@ void KPPPWidget::sigPPPDDied() {
 
-        qDebug( "Executing command on disconnect since pppd has died." );
+        odebug << "Executing command on disconnect since pppd has died." << oendl; 
         QApplication::flushX();
@@ -491,3 +491,3 @@ void KPPPWidget::sigPPPDDied() {
             if (false){
-                qDebug( "Trying to reconnect... " );
+                odebug << "Trying to reconnect... " << oendl; 
 
@@ -513,3 +513,3 @@ void KPPPWidget::sigPPPDDied() {
 // void KPPPWidget::sigChld() {
-//   qDebug( "sigchld()" );
+//   odebug << "sigchld()" << oendl; 
 //   //  pid_t id = wait(0L);
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
@@ -57,3 +57,3 @@
 #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); }
@@ -167,3 +167,3 @@ bool Modem::opentty() {
     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.");
@@ -308,5 +308,5 @@ void Modem::startNotifier() {
       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);
@@ -323,3 +323,3 @@ void Modem::stopNotifier() {
     sn = 0;
-    qDebug( "QSocketNotifier stopped!" );
+    odebug << "QSocketNotifier stopped!" << oendl; 
   }
@@ -339,3 +339,3 @@ bool Modem::writeChar(unsigned char c) {
     if (s < 0) {
-      qError( "write() in Modem::writeChar failed" );
+      oerr << "write() in Modem::writeChar failed" << oendl; 
       return false;
@@ -367,3 +367,3 @@ bool Modem::writeLine(const char *buf) {
       // 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;
@@ -476,3 +476,3 @@ QString Modem::parseModemSpeed(const QString &s) {
 
-  qDebug( "Modem reported result string: %s", s.latin1());
+  odebug << "Modem reported result string: " << s.latin1() << "" << oendl; 
 
@@ -562,3 +562,3 @@ QString Modem::parseModemSpeed(const QString &s) {
 
-  qDebug( "The parsed result is: %s", result.latin1());
+  odebug << "The parsed result is: " << result.latin1() << "" << oendl; 
 
@@ -575,3 +575,3 @@ int Modem::lockdevice() {
   if(!_pppdata->modemLockFile()) {
-    qDebug("The user doesn't want a lockfile.");
+    odebug << "The user doesn't want a lockfile." << oendl; 
     return 0;
@@ -597,3 +597,3 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
 
-      qDebug( "Device is locked by: %s", oldlock);
+      odebug << "Device is locked by: " << oldlock << "" << oendl; 
 
@@ -610,3 +610,3 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
 
-      qDebug( "lockfile is stale" );
+      odebug << "lockfile is stale" << oendl; 
     }
@@ -617,3 +617,3 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
     sprintf(newlock,"%010d\n", getpid());
-    qDebug("Locking Device: %s", newlock);
+    odebug << "Locking Device: " << newlock << "" << oendl; 
 
@@ -634,3 +634,3 @@ void Modem::unlockdevice() {
   if (modem_is_locked) {
-    qDebug( "UnLocking Modem Device" );
+    odebug << "UnLocking Modem Device" << oendl; 
     close(modemfd);
@@ -656,3 +656,3 @@ int Modem::openLockfile( QString lockfile, int flags)
     lockfile += device.right( device.length() - device.findRev("/") -1 );
-    qDebug("lockfile >%s<",lockfile.latin1());
+    odebug << "lockfile >" << lockfile.latin1() << "<" << oendl; 
     // TODO:
@@ -668,3 +668,3 @@ int Modem::openLockfile( QString lockfile, int flags)
     if ((fd = open(lockfile, flags, mode)) == -1) {
-        qDebug("error opening lockfile!");
+        odebug << "error opening lockfile!" << oendl; 
         lockfile = QString::null;
@@ -929,3 +929,3 @@ bool Modem::execpppd(const char *arguments) {
     default:
-      qDebug("In parent: pppd pid %d\n",pppdPid);
+      odebug << "In parent: pppd pid " << pppdPid << "\n" << oendl; 
       close(modemfd);
@@ -937,3 +937,3 @@ bool Modem::execpppd(const char *arguments) {
       if ( !(flag & O_NONBLOCK) ) {
-          qDebug("Setting nonblocking io");
+          odebug << "Setting nonblocking io" << oendl; 
           flag |= O_NONBLOCK;
@@ -956,3 +956,3 @@ 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) {
@@ -960,7 +960,7 @@ bool Modem::killpppd() {
     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;
@@ -1037,3 +1037,3 @@ int Modem::openResolv(int flags)
     if ((fd = open(_PATH_RESCONF, flags)) == -1) {
-        qDebug("error opening resolv.conf!");
+        odebug << "error opening resolv.conf!" << oendl; 
         fd = open(DEVNULL, O_RDONLY);
@@ -1058,3 +1058,3 @@ pid_t Modem::pppPID()const {
 void Modem::setPPPDPid( pid_t pid ) {
-    qDebug("Modem setting pid");
+    odebug << "Modem setting pid" << oendl; 
     _pppdExitStatus = -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
@@ -27,6 +27,6 @@ PPPConfigWidget::PPPConfigWidget( InterfacePPP* iface, QWidget *parent,
     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; 
 
@@ -60,5 +60,5 @@ 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() );
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
@@ -58,4 +58,4 @@ PPPData::PPPData()
   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; 
 
@@ -88,3 +88,3 @@ void PPPData::save()
 {
-    qDebug("PPPData saving data");
+    odebug << "PPPData saving data" << oendl; 
     writeConfig(GENERAL_GRP, NUMACCOUNTS_KEY, count());
@@ -102,5 +102,5 @@ void PPPData::save()
         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]);
@@ -112,5 +112,5 @@ void PPPData::save()
         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]);
@@ -123,3 +123,3 @@ void PPPData::save()
         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 );
@@ -144,3 +144,3 @@ QString PPPData::readConfig(const QString &group, const QString &key,
 {
-//    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);
@@ -367,3 +367,3 @@ const QString PPPData::modemDevice() {
 // bool PPPData::setModemName(const QString &n) {
-//     qDebug("Setting modem name to >%s<", n.latin1());
+//     odebug << "Setting modem name to >" << n.latin1() << "<" << oendl; 
 //     _modemName = n;
@@ -374,3 +374,3 @@ const QString PPPData::modemDevice() {
 // bool PPPData::changeModemName(const QString &n) {
-//     qDebug("Setting modem name to >%s<", n.latin1());
+//     odebug << "Setting modem name to >" << n.latin1() << "<" << oendl; 
 //     _modemName = n;
@@ -381,3 +381,3 @@ const QString PPPData::modemDevice() {
 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);
@@ -741,9 +741,9 @@ 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;
@@ -752,3 +752,3 @@ bool PPPData::setAccount(const QString &aname) {
     }
-    qDebug("FAILURE");
+    odebug << "FAILURE" << oendl; 
     return false;
@@ -774,7 +774,7 @@ bool PPPData::isUniqueAccname(const QString &n) {
       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;
@@ -790,9 +790,9 @@ 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;
@@ -822,3 +822,3 @@ bool PPPData::deleteAccount() {
             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; 
         }
@@ -832,3 +832,3 @@ bool PPPData::deleteAccount() {
             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; 
         }
@@ -842,3 +842,3 @@ bool PPPData::deleteAccount() {
             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; 
         }
@@ -862,3 +862,3 @@ int PPPData::newaccount() {
 
-    qDebug("PPPData::newaccount highcount %i/%i",highcount,MAX_ACCOUNTS);
+    odebug << "PPPData::newaccount highcount " << highcount << "/" << MAX_ACCOUNTS << "" << oendl; 
 //  if(!config) open();
@@ -871,3 +871,3 @@ int PPPData::newaccount() {
   accountList << tmp;
-  qDebug("PPPData::newaccount() Group: >%s<",cgroup.latin1());
+  odebug << "PPPData::newaccount() Group: >" << cgroup.latin1() << "<" << oendl; 
   setpppdArgumentDefaults();
@@ -967,5 +967,5 @@ 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, "");
@@ -1331,6 +1331,6 @@ void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces )
         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 );
@@ -1374,3 +1374,3 @@ 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;
@@ -1392,3 +1392,3 @@ bool PPPData::setDevice(const QString &dev )
 {
-    qDebug("setting device to >%s<", dev.latin1());
+    odebug << "setting device to >" << dev.latin1() << "<" << oendl; 
     QString save_mName = _modemName;
@@ -1396,6 +1396,6 @@ bool PPPData::setDevice(const QString &dev )
         _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;
@@ -1405,3 +1405,3 @@ bool PPPData::setDevice(const QString &dev )
     _modemName = save_mName;
-    qDebug("FAILURE");
+    odebug << "FAILURE" << oendl; 
     return false;
@@ -1426,3 +1426,3 @@ bool PPPData::deleteDevice()
             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; 
         }
@@ -1436,3 +1436,3 @@ bool PPPData::deleteDevice()
             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; 
         }
@@ -1446,3 +1446,3 @@ bool PPPData::deleteDevice()
             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; 
         }
@@ -1465,3 +1465,3 @@ int PPPData::newdevice()
 
-    qDebug("PPPData::newdevice highcount %i",highcountdev);
+    odebug << "PPPData::newdevice highcount " << highcountdev << "" << oendl; 
 
@@ -1472,3 +1472,3 @@ int PPPData::newdevice()
   deviceList << tmp;
-  qDebug("PPPData::newdevice() Group: >%s<",cgroup.latin1());
+  odebug << "PPPData::newdevice() Group: >" << cgroup.latin1() << "<" << oendl; 
   return highcountdev;
@@ -1486,6 +1486,6 @@ QStringList PPPData::getDevicesNamesList()
     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();
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
@@ -62,6 +62,6 @@ PPPModule::PPPModule() : Module()
     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() );
@@ -73,3 +73,3 @@ PPPModule::PPPModule() : Module()
         {
-            qDebug("iface is running %s", it.key().latin1() );
+            odebug << "iface is running " << it.key().latin1() << "" << oendl; 
             handledInterfaceNames << running[it.data()].device;
@@ -90,3 +90,3 @@ PPPModule::~PPPModule()
 {
-    qDebug("PPPModule::~PPPModule() " );
+    odebug << "PPPModule::~PPPModule() " << oendl; 
     QMap<QString,QString> ifaces;
@@ -99,3 +99,3 @@ PPPModule::~PPPModule()
         {
-            qDebug("Iface %s is still up", i->getHardwareName().latin1() );
+            odebug << "Iface " << i->getHardwareName().latin1() << " is still up" << oendl; 
             InterfacePPP* ppp = static_cast<InterfacePPP*>(i);
@@ -143,3 +143,3 @@ QWidget *PPPModule::configure(Interface *i)
 {
-    qDebug("return ModemWidget");
+    odebug << "return ModemWidget" << oendl; 
     PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i,
@@ -170,3 +170,3 @@ QList<Interface> PPPModule::getInterfaces()
     // List all of the files in the peer directory
-    qDebug("PPPModule::getInterfaces");
+    odebug << "PPPModule::getInterfaces" << oendl; 
     return list;
@@ -263,3 +263,3 @@ namespace
             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; 
 
@@ -274,3 +274,3 @@ namespace
         {
-            qDebug("isAvailable %d",  p);
+            odebug << "isAvailable " << p << "" << oendl; 
             return true;
@@ -278,3 +278,3 @@ namespace
 
-        qDebug("notAvailable %d", p);
+        odebug << "notAvailable " << p << "" << oendl; 
         return false;