1 files changed, 2 insertions, 4 deletions

diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp
index 8d3e151..a62a90c 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaces.cpp
@@ -2,49 +2,49 @@
 
 #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(QString("Interfaces: Can't open file: %1 for reading.").arg(interfacesFile).latin1());
+    qDebug("Interfaces: Can't open file: %s for reading.", interfacesFile.latin1() );
     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.  Usefull 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,51 +55,49 @@ QStringList Interfaces::getInterfaceList(){
     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());
-  if(awi.count() < 1)
-    return false;
-  return true;
+  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;
       }