1 files changed, 21 insertions, 21 deletions

diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp
index 6b161ae..e283926 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaces.cpp
@@ -3,49 +3,49 @@
 #include <qcheckbox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 // The three stanza's
 #define AUTO "auto"
 #define IFACE "iface"
 #define MAPPING "mapping"
 
 /**
  * Constructor.  Reads in the interfaces file and then split the file up by
  *  the \n for interfaces variable.
  * @param useInterfacesFile if an interface file other then the default is
  *  desired to be used it should be passed in.
  */
 Interfaces::Interfaces(QString useInterfacesFile){
   acceptedFamily.append(INTERFACES_FAMILY_INET);
   acceptedFamily.append(INTERFACES_FAMILY_IPX);
   acceptedFamily.append(INTERFACES_FAMILY_INET6);
 
   interfacesFile = useInterfacesFile;
   QFile file(interfacesFile);
   if (!file.open(IO_ReadOnly)){
-    qDebug("Interfaces: Can't open file: %s for reading.", interfacesFile.latin1() );
+    odebug << "Interfaces: Can't open file: " << interfacesFile.latin1() << " for reading." << oendl; 
     currentIface = interfaces.end();
     currentMapping = interfaces.end();
     return;
   }
   QTextStream stream( &file );
   QString line;
   while ( !stream.eof() ) {
     line += stream.readLine();
     line += "\n";
   }
   file.close();
   interfaces = QStringList::split("\n", line, true);
 
   currentIface = interfaces.end();
   currentMapping = interfaces.end();
 }
 
 
 /**
  * Get a list of all interfaces in the interface file.  Useful for
  * hardware that is not currently connected such as an 802.11b card
  * not plugged in, but configured for when it is plugged in.
  * @return Return string list of interfaces.
  **/
@@ -55,49 +55,49 @@ QStringList Interfaces::getInterfaceList(){
     QString line = (*it).simplifyWhiteSpace();
     if(line.contains(IFACE) && line.at(0) != '#'){
       line = line.mid(QString(IFACE).length() +1, line.length());
       line = line.simplifyWhiteSpace();
       int findSpace = line.find(" ");
       if( findSpace >= 0){
         line = line.mid(0, findSpace);
         list.append(line);
       }
     }
   }
   return list;
 }
 
 /**
  * Find out if interface is in an "auto" group or not.
  * Report any duplicates such as eth0 being in two differnt auto's
  * @param interface interface to check to see if it is on or not.
  * @return true is interface is in auto
  */
 bool Interfaces::isAuto(const QString &interface) const {
   QStringList autoLines = interfaces.grep(QRegExp(AUTO));
   QStringList awi = autoLines.grep(QRegExp(interface));
   if(awi.count() > 1)
-    qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1());
+    odebug << QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1() << oendl; 
   return awi.count() > 0;
 }
 
 /**
  * Attempt to set the auto option for interface to setAuto.
  * @param interface the interface to set
  * @param setAuto the value to set interface to.
  * @return false if already set to setAuto.
  * */
 bool Interfaces::setAuto(const QString &interface, bool setAuto){
   // Don't need to set it if it is already set.
   if(isAuto(interface) == setAuto)
     return false;
 
   bool changed = false;
   for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
     if((*it).contains(AUTO)){
       //We know that they are not in any group so let add to this auto.
       if(setAuto){
         (*it) = (*it) += " " + interface;
         // Don't care to have such thins as: auto eth0   lo  usb0
         (*it) = (*it).simplifyWhiteSpace();
         changed = true;
         break;
@@ -131,65 +131,65 @@ bool Interfaces::setAuto(const QString &interface, bool setAuto){
 bool Interfaces::setInterface(QString interface){
   interface = interface.simplifyWhiteSpace();
   interface = interface.replace(QRegExp(" "), "");
   return setStanza(IFACE, interface, currentIface);
 }
 
 /**
  * A quick helper funtion to see if the current interface is set.
  * @return bool true if set, false otherwise.
  */
 bool Interfaces::isInterfaceSet() const {
   return (interfaces.end() != currentIface);
 }
 
 /**
  * Add a new interface of with the settings - family and method
  * @param interface the name of the interface to set.  All whitespace is
  *  removed from the interface name.
  * @param family the family of this interface inet or inet, ipx or inet6
  *  Must of one of the families defined in interfaces.h
  * @param method for the family.  see interfaces man page for family methods.
  * @return true if successful.
  */
 bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){
-    qDebug("Interfaces::addInterface(%s)",interface.latin1());
+    odebug << "Interfaces::addInterface(" << interface.latin1() << ")" << oendl; 
   if(0 == acceptedFamily.contains(family))
     return false;
   QString newInterface = interface.simplifyWhiteSpace();
   newInterface = newInterface.replace(QRegExp(" "), "");
   interfaces.append("");
   interfaces.append(QString(IFACE " %1 %2 %3").arg(newInterface).arg(family).arg(method));
   return true;
 }
 
 /**
  * Copies interface with name interface to name newInterface
  * @param newInterface name of the new interface.
  * @return bool true if successful
  */
 bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){
-    qDebug("copy interface %s to %s", interface.latin1(), newInterface.latin1());
+    odebug << "copy interface " << interface.latin1() << " to " << newInterface.latin1() << "" << oendl; 
   if(!setInterface(interface))
     return false;
 
   // Store the old interface and bump past the stanza line.
   QStringList::Iterator it = currentIface;
   it++;
 
   // Add the new interface
   bool error;
   addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error));
   if(!setInterface(newInterface))
     return false;
 
   QStringList::Iterator newIface = currentIface;
   newIface++;
 
   // Copy all of the lines
   for ( ; it != interfaces.end(); ++it ){
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO)))
       break;
     newIface = interfaces.insert(newIface, *it);
   }
 
   return true;
@@ -254,56 +254,56 @@ QString Interfaces::getInterfaceFamily(bool &error){
  * @param error set to true if any error occurs, false otherwise.
  */
 QString Interfaces::getInterfaceMethod(bool &error){
   QString name = getInterfaceName(error);
   if(error)
     return QString();
   QString family = getInterfaceFamily(error);
   if(error)
     return QString();
   QString line = (*currentIface);
   line = line.mid(QString(IFACE).length()+1, line.length());
   line = line.mid(name.length()+1, line.length());
   line = line.mid(family.length()+1, line.length());
   line = line.simplifyWhiteSpace();
   error = false;
   return line;
 }
 
 /**
  * Sets the interface name to newName.
  * @param newName the new name of the interface.  All whitespace is removed.
  * @return bool true if successful.
  */
 bool Interfaces::setInterfaceName(const QString &newName){
-    qDebug("setInterfaceName %s", newName.latin1());
+    odebug << "setInterfaceName " << newName.latin1() << "" << oendl; 
   if(currentIface == interfaces.end())
     return false;
   QString name = newName.simplifyWhiteSpace();
   name = name.replace(QRegExp(" "), "");
   bool returnValue = false;
   QString tmp = QString("iface %1 %2 %3").arg(name).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue));
-  qDebug("setting  %s",tmp.latin1());
+  odebug << "setting  " << tmp.latin1() << "" << oendl; 
 
   (*currentIface) = tmp;
   return !returnValue;
 }
 
 /**
  * Sets the interface family to newName.
  * @param newName the new name of the interface.  Must be one of the families
  *  defined in the interfaces.h file.
  * @return bool true if successful.
  */
 bool Interfaces::setInterfaceFamily(const QString &newName){
   if(currentIface == interfaces.end())
     return false;
   if(acceptedFamily.contains(newName)==0)
     return false;
   bool returnValue = false;
   (*currentIface) = QString("iface %1 %2 %3").arg(getInterfaceName(returnValue)).arg(newName).arg(getInterfaceMethod(returnValue));
   return !returnValue;
 }
 
 /**
  * Sets the interface method to newName
  * @param newName the new name of the interface
@@ -324,49 +324,49 @@ bool Interfaces::setInterfaceMethod(const QString &newName){
  *  iface eth0 static
  *    address 192.168.1.1
  * @param option the options to get the value.
  * @param error set to true if any error occurs, false otherwise.
  * @return QString the options value. QString::null if error == true
  */
 QString Interfaces::getInterfaceOption(const QString &option, bool &error){
   return getOption(currentIface, option, error);
 }
 
 /**
  * Set a value for an option in the currently selected interface.  If option
  *  doesn't exist then it is added along with the value.
  * If value isEmpty() then we will remove the option
  *
  * @param option the options to set the value.
  * @param value the value that option should be set to.
  * @param error set to true if any error occurs, false otherwise.
  * @return QString the options value. QString::null if error == true
  */
 bool Interfaces::setInterfaceOption(const QString &option, const QString &value){
     if( value.stripWhiteSpace().isEmpty() )
         return removeInterfaceOption( option );
 
-    qDebug("iface >%s< option >%s< value >%s<", (*currentIface).latin1(), option.latin1(),value.latin1());
+    odebug << "iface >" << (*currentIface).latin1() << "< option >" << option.latin1() << "< value >" << value.latin1() << "<" << oendl; 
     return setOption(currentIface, option, value);
 }
 
 /**
  * Removes a value for an option in the currently selected interface.
  * @param option the options to set the value.
  * @param error set to true if any error occurs, false otherwise.
  * @return QString the options value. QString::null if error == true
  */
 bool Interfaces::removeInterfaceOption(const QString &option){
   return removeOption(currentIface, option);
 }
 
 /**
  * Removes a value for an option in the currently selected interface.
  * @param option the options to set the value.
  * @param value the value that option should be set to.
  * @param error set to true if any error occurs, false otherwise.
  * @return QString the options value. QString::null if error == true
  */
 bool Interfaces::removeInterfaceOption(const QString &option, const QString &value){
   return removeOption(currentIface, option, value);
 }
 
@@ -465,173 +465,173 @@ QString Interfaces::getScript(bool &error){
  * @param interator interator to place at location of stanza if successful.
  * @return bool true if the stanza is found.
  */
 bool Interfaces::setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator){
   bool found = false;
   iterator = interfaces.end();
   for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
     if(line.contains(stanza) && line.contains(option) && line.at(0) != '#'){
       uint point = line.find(option);
       bool valid = true;
       if(point > 0){
         // There are more chars in the line. check +1
         if(line.at(point-1) != ' ')
           valid = false;
       }
       point += option.length();
       if(point < line.length()-1){
         // There are more chars in the line. check -1
         if(line.at(point) != ' ')
           valid = false;
       }
       if(valid){
         if(found == true){
-          qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1());
+          odebug << QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1() << oendl; 
         }
         found = true;
         iterator = it;
       }
     }
   }
   return found;
 }
 
 /**
  * Sets a value of an option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when setting value.
  * @return bool true if successful, false otherwise.
  */
 bool Interfaces::setOption(const QStringList::Iterator &start, const QString &option, const QString &value){
   if(start == interfaces.end())
     return false;
-  qDebug("setting option");
+  odebug << "setting option" << oendl; 
   bool found = false;
   bool replaced = false;
   QStringList::Iterator insertAt = NULL;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
-      qDebug(" Interfaces::setOption got line >%s<",(*it).latin1());
+      odebug << " Interfaces::setOption got line >" << (*it).latin1() << "<" << oendl; 
       // FIXME: was  not completly stupid just wrong sice all options got inserted bevore the iface line
       // but since it works with an empty interfaces file I (tille) will not do anything more
       if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO)) ){
           if (found) break;
 //  && it != start){
 //       if(!found && value != ""){
 //         // Got to the end of the stanza without finding it, so append it.
-//           qDebug(" Got to the end of the stanza without finding it, so append it.");
+//           odebug << " Got to the end of the stanza without finding it, so append it." << oendl; 
 //         interfaces.insert(--it, QString("\t%1 %2").arg(option).arg(value));
 //       }
-         qDebug("found 1");
+         odebug << "found 1" << oendl; 
 //         interfaces.insert(++it, QString("\t%1 %2").arg(option).arg(value));
        found = true;
        insertAt = it;
 
      }
     if((*it).contains(option) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
-        qDebug("found 2");
+        odebug << "found 2" << oendl; 
       if(found)
-        qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1());
+        odebug << QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1() << oendl; 
       found = true;
       replaced = true;
         (*it) = QString("\t%1 %2").arg(option).arg(value);
     }
   }
   if(!found){
-      qDebug("! found insert anyway");
+      odebug << "! found insert anyway" << oendl; 
     QStringList::Iterator p = start;
     interfaces.insert(++p, QString("\t%1 %2").arg(option).arg(value));
     found = true;
   }
 
   if(found && !replaced){
-      qDebug("found iface but not the option so insert it here...");
+      odebug << "found iface but not the option so insert it here..." << oendl; 
       interfaces.insert(++insertAt, QString("\t%1 %2").arg(option).arg(value));
   }
   return found;
 }
 
 /**
  * Removes a stanza and all of its options
  * @param stanza the stanza to remove
  * @return bool true if successful.
  */
 bool Interfaces::removeStanza(QStringList::Iterator &stanza){
   if(stanza == interfaces.end())
     return false;
   (*stanza) = "";
   return removeAllOptions(stanza);
 }
 
 /**
  * Removes a option in a stanza
  * @param start the start of the stanza
  * @param option the option to remove
  * @return bool true if successful, false otherwise.
  */
 bool Interfaces::removeOption(const QStringList::Iterator &start, const QString &option){
   if(start == interfaces.end())
     return false;
 
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       // got to the end without finding it
       break;
     }
     if((*it).contains(option) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
       if(found)
-        qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1());
+        odebug << QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1() << oendl; 
       found = true;
       it = interfaces.remove( it ); // we really want to remove the line
       --it; // we do ++it later in the head of the for loop
     }
   }
   return found;
 }
 
 /**
  * Removes a option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when setting value.
  * @return bool true if successful, false otherwise.
  */
 bool Interfaces::removeOption(const QStringList::Iterator &start, const QString &option, const QString &value){
   if(start == interfaces.end())
     return false;
 
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       // got to the end without finding it
       break;
     }
     if((*it).contains(option) && (*it).contains(value) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
       if(found)
-        qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1());
+        odebug << QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1() << oendl; 
       found = true;
       it = interfaces.remove( it ); // we really want to remove the line
       --it; // we do ++it later in the head of the for loop
     }
   }
   return found;
 }
 
 /**
  * Removes all options in a stanza
  * @param start the start of the stanza
  * @return bool true if successful, false otherwise.
  */
 bool Interfaces::removeAllOptions(const QStringList::Iterator &start){
   if(start == interfaces.end())
     return false;
 
   QStringList::Iterator it = start;
   it = ++it;
   for (; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       break;
     }
     it = interfaces.remove(it);
@@ -642,71 +642,71 @@ bool Interfaces::removeAllOptions(const QStringList::Iterator &start){
   return true;
 }
 
 /**
  * Gets a value of an option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when getting the value.
  * @param bool true if errors false otherwise.
  * @return QString the value of option QString::null() if error == true.
  */
 QString Interfaces::getOption(const QStringList::Iterator &start, const QString &option, bool &error){
   if(start == interfaces.end()){
     error = false;
     return QString();
   }
 
   QString value;
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       break;
     }
     if((*it).contains(option) && (*it).at(0) != '#'){
       if(found)
-        qDebug(QString("Interfaces: getOption found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1());
+        odebug << QString("Interfaces: getOption found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1() << oendl; 
       found = true;
       QString line = (*it).simplifyWhiteSpace();
       int space = line.find(" ", option.length());
       if(space != -1){
         value = line.mid(space+1, line.length());
         break;
       }
     }
   }
   error = !found;
   return value;
 }
 
 /**
  * Write out the interfaces file to the file passed into the constructor.
  * Removes any excess blank lines over 1 line long.
  * @return bool true if successful, false if not.
  */
 bool Interfaces::write(){
   QFile::remove(interfacesFile);
   QFile file(interfacesFile);
 
   if (!file.open(IO_ReadWrite)){
-    qDebug(QString("Interfaces: Can't open file: %1 for writing.").arg(interfacesFile).latin1());
+    odebug << QString("Interfaces: Can't open file: %1 for writing.").arg(interfacesFile).latin1() << oendl; 
     return false;
   }
   QTextStream stream( &file );
   int whiteSpaceCount = 0;
   for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
     line = line.replace(QRegExp(" "),"");
     if(line.length() == 0)
       whiteSpaceCount++;
     else
       whiteSpaceCount = 0;
     if(whiteSpaceCount < 2){
-      qDebug((*it).latin1());
+      odebug << (*it).latin1() << oendl; 
       stream << (*it) << '\n';
     }
   }
   file.close();
   return true;
 }
 
 // interfaces.cpp