1 files changed, 46 insertions, 46 deletions

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;