More optimizations, 1 memory leak fixed

8 files changed, 186 insertions, 192 deletions

diff --git a/noncore/net/networksetup/interfaces/interfaces.cpp b/noncore/net/networksetup/interfaces/interfaces.cpp
index 708f399..e49998e 100644
--- a/noncore/net/networksetup/interfaces/interfaces.cpp
+++ b/noncore/net/networksetup/interfaces/interfaces.cpp
@@ -1,12 +1,13 @@
 #include "interfaces.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
@@ -99,33 +100,28 @@ bool Interfaces::setAuto(const QString &interface, bool setAuto){
         (*it) = (*it) += " " + interface;
         // Don't care to have such thins as: auto eth0   lo  usb0
 	(*it) = (*it).simplifyWhiteSpace();
         changed = true;
         break;
       }
+      // else see if we need to remove from this one
       else{
         if((*it).contains(interface)){
           (*it) = (*it).replace(QRegExp(interface), "");
-          // clean up
-	  QString line = (*it).simplifyWhiteSpace();
-          line = line.replace(QRegExp(" "),"");
-          if(line == AUTO)
+          // if AUTO is the only thing left clear the line
+          if(((*it).simplifyWhiteSpace()).replace(QRegExp(" "),"") == AUTO)
             (*it) = "";
           changed = true;
 	  // Don't break because we want to make sure we remove all cases.
         }
       }
     }
   }
-  if(changed == false){
-    if(setAuto == true)
-      interfaces.append(QString(AUTO" %1").arg(interface));
-    else{
-      qDebug(QString("Interfaces: Can't set interface %1 auto to false sense it is already false.").arg(interface).latin1());
-    }
-  }
+  // In the case where there is no AUTO field add one.
+  if(!changed && setAuto)
+    interfaces.append(QString(AUTO" %1").arg(interface));
   return true;
 }
 
 /**
  * Set the current interface to interface.  This needs to be done before you
  *  can call getFamily(), getMethod, and get/setOption().
@@ -154,13 +150,13 @@ bool Interfaces::isInterfaceSet(){
  * @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 successfull.
  */ 
 bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){
-  if(acceptedFamily.contains(family)==0)
+  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;
@@ -169,23 +165,29 @@ bool Interfaces::addInterface(const QString &interface, const QString &family, c
 /**
  * Copies interface with name interface to name newInterface
  * @param newInterface name of the new interface.
  * @return bool true if successfull
  */ 
 bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){
-  if(!setInterface(interface)) return false;
-	 
+  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;
+  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);
   }
  
@@ -194,16 +196,13 @@ bool Interfaces::copyInterface(const QString &interface, const QString &newInter
 
 /**
  * Remove the currently selected interface and all of its options.
  * @return bool if successfull or not.
  */ 
 bool Interfaces::removeInterface(){
-  if(currentIface == interfaces.end())
-    return false;
-  (*currentIface) = "";
-  return removeAllInterfaceOptions();
+  return removeStanza(currentIface);
 }
 
 /**
  * Gets the hardware name of the interface that is currently selected.
  * @return QString name of the hardware interface (eth0, usb2, wlan1...).
  * @param error set to true if any error occurs, false otherwise.
@@ -229,16 +228,14 @@ QString Interfaces::getInterfaceName(bool &error){
  * Gets the family name of the interface that is currently selected.
  * @return QString name of the family (inet, inet6, ipx).
  * @param error set to true if any error occurs, false otherwise.
  */ 
 QString Interfaces::getInterfaceFamily(bool &error){
   QString name = getInterfaceName(error);
-  if(error){
-    error = true;
+  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.simplifyWhiteSpace();
   int findSpace = line.find(" ");
   if( findSpace < 0){
@@ -254,21 +251,17 @@ QString Interfaces::getInterfaceFamily(bool &error){
  * @return QString name of the method such as staic or dhcp.
  * See the man page of interfaces for possible methods depending on the family.
  * @param error set to true if any error occurs, false otherwise.
  */ 
 QString Interfaces::getInterfaceMethod(bool &error){
   QString name = getInterfaceName(error);
-  if(error){
-    error = true;
+  if(error)
     return QString();
-  }
   QString family = getInterfaceFamily(error);
-  if(error){
-    error = true;
+  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;
@@ -388,16 +381,13 @@ void Interfaces::addMapping(const QString &option){
 
 /**
  * Remove the currently selected map and all of its options.
  * @return bool if successfull or not.
  */
 bool Interfaces::removeMapping(){
-  if(currentMapping == interfaces.end())
-    return false;
-  (*currentMapping) = "";
-  return removeAllOptions(currentMapping);
+  return removeStanza(currentMapping);
 } 
 
 /**
  * Set a map option within a mapping.
  * @param map map to use
  * @param value value to go with map
@@ -517,12 +507,25 @@ bool Interfaces::setOption(const QStringList::Iterator &start, const QString &op
     QStringList::Iterator p = start;
     interfaces.insert(++p, QString("\t%1 %2").arg(option).arg(value));
     found = true;
   }
   return found;
 }
+
+/**
+ * Removes a stanza and all of its options
+ * @param stanza the stanza to remove
+ * @return bool true if successfull.
+ */ 
+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 use when setting value.
  * @return bool true if successfull, false otherwise.
  */
@@ -588,20 +591,20 @@ QString Interfaces::getOption(const QStringList::Iterator &start, const QString
   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: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1());
+        qDebug(QString("Interfaces: getOption found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1());
       found = true;
       QString line = (*it).simplifyWhiteSpace();
       int space = line.find(" ", option.length());
-      if(space != -1)
+      if(space != -1){
         value = line.mid(space+1, line.length());
-      else
-        qDebug(QString("Interfaces: Option %1 with no value").arg(option).latin1());
+        break;
+      }
     }
   }
   error = !found;
   return value;
 }
 
diff --git a/noncore/net/networksetup/interfaces/interfaces.h b/noncore/net/networksetup/interfaces/interfaces.h
index 26abb73..5a8feb6 100644
--- a/noncore/net/networksetup/interfaces/interfaces.h
+++ b/noncore/net/networksetup/interfaces/interfaces.h
@@ -25,13 +25,13 @@ public:
   Interfaces(QString useInterfacesFile = "/etc/network/interfaces");
   QStringList getInterfaceList();
   
   bool isAuto(const QString &interface);
   bool setAuto(const QString &interface, bool setAuto);
   
-  bool removeInterface();
+  inline bool removeInterface();
   bool addInterface(const QString &interface, const QString &family, const QString &method);
   bool copyInterface(const QString &oldInterface, const QString &newInterface);
   bool setInterface(QString interface);
   inline bool isInterfaceSet();
   QString getInterfaceName(bool &error);
   bool setInterfaceName(const QString &newName);
@@ -42,13 +42,13 @@ public:
   inline QString getInterfaceOption(const QString &option, bool &error); 
   inline bool setInterfaceOption(const QString &option, const QString &value);
   inline bool removeInterfaceOption(const QString &option, const QString &value);
   inline bool removeAllInterfaceOptions();
   
   bool setMapping(const QString &interface);
-  bool removeMapping();
+  inline bool removeMapping();
   inline void addMapping(const QString &options);
   inline bool setMap(const QString &map, const QString &value);
   inline bool removeMap(const QString &map, const QString &value);
   inline QString getMap(const QString &map, bool &error);
   inline bool setScript(const QString &argument);
   inline QString getScript(bool &error);
@@ -57,12 +57,13 @@ public:
   
 private:
   bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator);
   bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value);
   bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value);
   QString getOption(const QStringList::Iterator &start, const QString &option, bool &error);
+  bool removeStanza(QStringList::Iterator &stanza);
   bool removeAllOptions(const QStringList::Iterator &start);
   
   QString interfacesFile;
   QStringList interfaces;
   QStringList::Iterator currentIface;
   QStringList::Iterator currentMapping;
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
index 3b1a4de..4818e37 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
@@ -1,152 +1,145 @@
 #include "interfacesetupimp.h"
 #include "interface.h"
-#include "interfaces.h"
 
-#include <qdialog.h>
-#include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 
 #include <qmessagebox.h>
 
-#include <assert.h>
-
 #define DNSSCRIPT "changedns"
 
 /**
- * Constuctor.  Set up the connection and load the first profile.
+ * Constuctor.  Set up the connection. A profile must be set.
  */ 
-InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, WFlags fl) : InterfaceSetup(parent, name, fl){
-  assert(parent);
-  assert(i);
-  interface = i;
-  interfaces = new Interfaces();
-  bool error = false;
-  if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
-    staticGroupBox->hide();
-    dhcpCheckBox->hide();
-    leaseTime->hide();
-    leaseHoursLabel->hide();
-  }
+InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i){
 }
 
 /**
  * Save the current settings, then write out the interfaces file and close. 
  */
 bool InterfaceSetupImp::saveChanges(){
   if(!saveSettings())
     return false;
-  interfaces->write();
+  interfaces.write();
   return true;
 }
 
 /**
  * Save the settings for the current Interface.
  * @return bool true if successfull, false otherwise
  */ 
 bool InterfaceSetupImp::saveSettings(){
   // eh can't really do anything about it other then return. :-D
-  if(!interfaces->isInterfaceSet())
+  if(!interfaces.isInterfaceSet())
     return true;
   
   bool error = false;
   // Loopback case
-  if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
-    interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
+  if(interfaces.getInterfaceMethod(error) == INTERFACES_LOOPBACK){
+    interfaces.setAuto(interface->getInterfaceName(), autoStart->isChecked());
     return true;
   }
   
   if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
    QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok);
    return false;
   }	
-  interfaces->removeAllInterfaceOptions();
+  interfaces.removeAllInterfaceOptions();
   
   // DHCP
   if(dhcpCheckBox->isChecked()){
-    interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP);
-    interfaces->setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value()));
-    interfaces->setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60));
+    interfaces.setInterfaceMethod(INTERFACES_METHOD_DHCP);
+    interfaces.setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value()));
+    interfaces.setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60));
   }
   else{
-    interfaces->setInterfaceMethod("static");
-    interfaces->setInterfaceOption("address", ipAddressEdit->text());
-    interfaces->setInterfaceOption("netmask", subnetMaskEdit->text());
-    interfaces->setInterfaceOption("gateway", gatewayEdit->text());
+    interfaces.setInterfaceMethod("static");
+    interfaces.setInterfaceOption("address", ipAddressEdit->text());
+    interfaces.setInterfaceOption("netmask", subnetMaskEdit->text());
+    interfaces.setInterfaceOption("gateway", gatewayEdit->text());
     if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){
       QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
-      interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns);
-      interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns);
+      interfaces.setInterfaceOption("up "DNSSCRIPT" -a ", dns);
+      interfaces.setInterfaceOption("down "DNSSCRIPT" -r ", dns);
     }
   }
   
   // IP Information
-  interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
+  interfaces.setAuto(interface->getInterfaceName(), autoStart->isChecked());
   return true;
 }
 
 /**
  * The Profile has changed.
- * @profile the new profile.
+ * @param QString profile the new profile.
  */ 
 void InterfaceSetupImp::setProfile(const QString &profile){
+   /*
+  bool error = false;
+  if(interfaces.getInterfaceMethod(error) == INTERFACES_LOOPBACK){
+    staticGroupBox->hide();
+    dhcpCheckBox->hide();
+    leaseTime->hide();
+    leaseHoursLabel->hide();
+  }
+  */
+  
   QString newInterfaceName = interface->getInterfaceName();
   if(profile.length() > 0)
     newInterfaceName += "_" + profile;
-  qDebug("InterfaceSetupImp::setProfile");
   // See if we have to make a interface.
-  if(!interfaces->setInterface(newInterfaceName)){
+  if(!interfaces.setInterface(newInterfaceName)){
     // Add making for this new interface if need too
     if(profile != ""){
-      interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName);
-      if(!interfaces->setMapping(interface->getInterfaceName())){
-        interfaces->addMapping(interface->getInterfaceName());
-        if(!interfaces->setMapping(interface->getInterfaceName())){
-	  qDebug("InterfaceSetupImp: Added Mapping, but still can't set.");
+      interfaces.copyInterface(interface->getInterfaceName(), newInterfaceName);
+      if(!interfaces.setMapping(interface->getInterfaceName())){
+        interfaces.addMapping(interface->getInterfaceName());
+        if(!interfaces.setMapping(interface->getInterfaceName())){
+	  qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
           return;
 	}
       }
-      interfaces->setMap("map", newInterfaceName);
-      interfaces->setScript("getprofile.sh");
+      interfaces.setMap("map", newInterfaceName);
+      interfaces.setScript("getprofile.sh");
     }
     else{
-      interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
-      if(!interfaces->setInterface(newInterfaceName)){
-        qDebug("InterfaceSetupImp: Added interface, but still can't set.");
+      interfaces.addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
+      if(!interfaces.setInterface(newInterfaceName)){
+        qDebug("InterfaceSetupImp: Added interface, but still can't setInterface.");
         return;	      
       }
     }
   }
   
   // We must have a valid interface to get this far so read some settings.
   
   // DHCP
   bool error = false;
-  if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
+  if(interfaces.getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
     dhcpCheckBox->setChecked(true);
   else
     dhcpCheckBox->setChecked(false);
-  leaseTime->setValue(interfaces->getInterfaceOption("leasehours", error).toInt());
+  leaseTime->setValue(interfaces.getInterfaceOption("leasehours", error).toInt());
   if(error)
-    leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60);
+    leaseTime->setValue(interfaces.getInterfaceOption("leasetime", error).toInt()/60/60);
   if(error)
     leaseTime->setValue(24);
 
   // IP Information
-  autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
-  QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error);
+  autoStart->setChecked(interfaces.isAuto(interface->getInterfaceName()));
+  QString dns = interfaces.getInterfaceOption("up "DNSSCRIPT" -a", error);
   if(dns.contains(" ")){
     firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
     secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); 
   }
-  ipAddressEdit->setText(interfaces->getInterfaceOption("address", error));
-  subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error));
-  gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); 
-}
+  ipAddressEdit->setText(interfaces.getInterfaceOption("address", error));
+  subnetMaskEdit->setText(interfaces.getInterfaceOption("netmask", error));
+  gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error)); 
 
+}
   
 // interfacesetup.cpp
 
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.h b/noncore/net/networksetup/interfaces/interfacesetupimp.h
index 60933aa..9ec526c 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.h
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.h
@@ -1,14 +1,14 @@
 #ifndef INTERFACESETUPIMP_H
 #define INTERFACESETUPIMP_H
 
 #include "interfacesetup.h"
+#include "interfaces.h"
 #include <qdialog.h>
 
 class Interface;
-class Interfaces;
 
 class InterfaceSetupImp : public InterfaceSetup {
   Q_OBJECT
 	
 public:
   InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, WFlags fl = 0);
@@ -16,13 +16,13 @@ public:
   
 public slots:
   void setProfile(const QString &profile);
   bool saveSettings();
 
 private:
-  Interfaces *interfaces;
+  Interfaces interfaces;
   Interface *interface;
 };
 
 
 #include <qlayout.h>
 
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp
index 708f399..e49998e 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaces.cpp
@@ -1,12 +1,13 @@
 #include "interfaces.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
@@ -99,33 +100,28 @@ bool Interfaces::setAuto(const QString &interface, bool setAuto){
         (*it) = (*it) += " " + interface;
         // Don't care to have such thins as: auto eth0   lo  usb0
 	(*it) = (*it).simplifyWhiteSpace();
         changed = true;
         break;
       }
+      // else see if we need to remove from this one
       else{
         if((*it).contains(interface)){
           (*it) = (*it).replace(QRegExp(interface), "");
-          // clean up
-	  QString line = (*it).simplifyWhiteSpace();
-          line = line.replace(QRegExp(" "),"");
-          if(line == AUTO)
+          // if AUTO is the only thing left clear the line
+          if(((*it).simplifyWhiteSpace()).replace(QRegExp(" "),"") == AUTO)
             (*it) = "";
           changed = true;
 	  // Don't break because we want to make sure we remove all cases.
         }
       }
     }
   }
-  if(changed == false){
-    if(setAuto == true)
-      interfaces.append(QString(AUTO" %1").arg(interface));
-    else{
-      qDebug(QString("Interfaces: Can't set interface %1 auto to false sense it is already false.").arg(interface).latin1());
-    }
-  }
+  // In the case where there is no AUTO field add one.
+  if(!changed && setAuto)
+    interfaces.append(QString(AUTO" %1").arg(interface));
   return true;
 }
 
 /**
  * Set the current interface to interface.  This needs to be done before you
  *  can call getFamily(), getMethod, and get/setOption().
@@ -154,13 +150,13 @@ bool Interfaces::isInterfaceSet(){
  * @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 successfull.
  */ 
 bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){
-  if(acceptedFamily.contains(family)==0)
+  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;
@@ -169,23 +165,29 @@ bool Interfaces::addInterface(const QString &interface, const QString &family, c
 /**
  * Copies interface with name interface to name newInterface
  * @param newInterface name of the new interface.
  * @return bool true if successfull
  */ 
 bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){
-  if(!setInterface(interface)) return false;
-	 
+  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;
+  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);
   }
  
@@ -194,16 +196,13 @@ bool Interfaces::copyInterface(const QString &interface, const QString &newInter
 
 /**
  * Remove the currently selected interface and all of its options.
  * @return bool if successfull or not.
  */ 
 bool Interfaces::removeInterface(){
-  if(currentIface == interfaces.end())
-    return false;
-  (*currentIface) = "";
-  return removeAllInterfaceOptions();
+  return removeStanza(currentIface);
 }
 
 /**
  * Gets the hardware name of the interface that is currently selected.
  * @return QString name of the hardware interface (eth0, usb2, wlan1...).
  * @param error set to true if any error occurs, false otherwise.
@@ -229,16 +228,14 @@ QString Interfaces::getInterfaceName(bool &error){
  * Gets the family name of the interface that is currently selected.
  * @return QString name of the family (inet, inet6, ipx).
  * @param error set to true if any error occurs, false otherwise.
  */ 
 QString Interfaces::getInterfaceFamily(bool &error){
   QString name = getInterfaceName(error);
-  if(error){
-    error = true;
+  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.simplifyWhiteSpace();
   int findSpace = line.find(" ");
   if( findSpace < 0){
@@ -254,21 +251,17 @@ QString Interfaces::getInterfaceFamily(bool &error){
  * @return QString name of the method such as staic or dhcp.
  * See the man page of interfaces for possible methods depending on the family.
  * @param error set to true if any error occurs, false otherwise.
  */ 
 QString Interfaces::getInterfaceMethod(bool &error){
   QString name = getInterfaceName(error);
-  if(error){
-    error = true;
+  if(error)
     return QString();
-  }
   QString family = getInterfaceFamily(error);
-  if(error){
-    error = true;
+  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;
@@ -388,16 +381,13 @@ void Interfaces::addMapping(const QString &option){
 
 /**
  * Remove the currently selected map and all of its options.
  * @return bool if successfull or not.
  */
 bool Interfaces::removeMapping(){
-  if(currentMapping == interfaces.end())
-    return false;
-  (*currentMapping) = "";
-  return removeAllOptions(currentMapping);
+  return removeStanza(currentMapping);
 } 
 
 /**
  * Set a map option within a mapping.
  * @param map map to use
  * @param value value to go with map
@@ -517,12 +507,25 @@ bool Interfaces::setOption(const QStringList::Iterator &start, const QString &op
     QStringList::Iterator p = start;
     interfaces.insert(++p, QString("\t%1 %2").arg(option).arg(value));
     found = true;
   }
   return found;
 }
+
+/**
+ * Removes a stanza and all of its options
+ * @param stanza the stanza to remove
+ * @return bool true if successfull.
+ */ 
+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 use when setting value.
  * @return bool true if successfull, false otherwise.
  */
@@ -588,20 +591,20 @@ QString Interfaces::getOption(const QStringList::Iterator &start, const QString
   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: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1());
+        qDebug(QString("Interfaces: getOption found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1());
       found = true;
       QString line = (*it).simplifyWhiteSpace();
       int space = line.find(" ", option.length());
-      if(space != -1)
+      if(space != -1){
         value = line.mid(space+1, line.length());
-      else
-        qDebug(QString("Interfaces: Option %1 with no value").arg(option).latin1());
+        break;
+      }
     }
   }
   error = !found;
   return value;
 }
 
diff --git a/noncore/settings/networksettings/interfaces/interfaces.h b/noncore/settings/networksettings/interfaces/interfaces.h
index 26abb73..5a8feb6 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.h
+++ b/noncore/settings/networksettings/interfaces/interfaces.h
@@ -25,13 +25,13 @@ public:
   Interfaces(QString useInterfacesFile = "/etc/network/interfaces");
   QStringList getInterfaceList();
   
   bool isAuto(const QString &interface);
   bool setAuto(const QString &interface, bool setAuto);
   
-  bool removeInterface();
+  inline bool removeInterface();
   bool addInterface(const QString &interface, const QString &family, const QString &method);
   bool copyInterface(const QString &oldInterface, const QString &newInterface);
   bool setInterface(QString interface);
   inline bool isInterfaceSet();
   QString getInterfaceName(bool &error);
   bool setInterfaceName(const QString &newName);
@@ -42,13 +42,13 @@ public:
   inline QString getInterfaceOption(const QString &option, bool &error); 
   inline bool setInterfaceOption(const QString &option, const QString &value);
   inline bool removeInterfaceOption(const QString &option, const QString &value);
   inline bool removeAllInterfaceOptions();
   
   bool setMapping(const QString &interface);
-  bool removeMapping();
+  inline bool removeMapping();
   inline void addMapping(const QString &options);
   inline bool setMap(const QString &map, const QString &value);
   inline bool removeMap(const QString &map, const QString &value);
   inline QString getMap(const QString &map, bool &error);
   inline bool setScript(const QString &argument);
   inline QString getScript(bool &error);
@@ -57,12 +57,13 @@ public:
   
 private:
   bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator);
   bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value);
   bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value);
   QString getOption(const QStringList::Iterator &start, const QString &option, bool &error);
+  bool removeStanza(QStringList::Iterator &stanza);
   bool removeAllOptions(const QStringList::Iterator &start);
   
   QString interfacesFile;
   QStringList interfaces;
   QStringList::Iterator currentIface;
   QStringList::Iterator currentMapping;
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 3b1a4de..4818e37 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -1,152 +1,145 @@
 #include "interfacesetupimp.h"
 #include "interface.h"
-#include "interfaces.h"
 
-#include <qdialog.h>
-#include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 
 #include <qmessagebox.h>
 
-#include <assert.h>
-
 #define DNSSCRIPT "changedns"
 
 /**
- * Constuctor.  Set up the connection and load the first profile.
+ * Constuctor.  Set up the connection. A profile must be set.
  */ 
-InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, WFlags fl) : InterfaceSetup(parent, name, fl){
-  assert(parent);
-  assert(i);
-  interface = i;
-  interfaces = new Interfaces();
-  bool error = false;
-  if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
-    staticGroupBox->hide();
-    dhcpCheckBox->hide();
-    leaseTime->hide();
-    leaseHoursLabel->hide();
-  }
+InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i){
 }
 
 /**
  * Save the current settings, then write out the interfaces file and close. 
  */
 bool InterfaceSetupImp::saveChanges(){
   if(!saveSettings())
     return false;
-  interfaces->write();
+  interfaces.write();
   return true;
 }
 
 /**
  * Save the settings for the current Interface.
  * @return bool true if successfull, false otherwise
  */ 
 bool InterfaceSetupImp::saveSettings(){
   // eh can't really do anything about it other then return. :-D
-  if(!interfaces->isInterfaceSet())
+  if(!interfaces.isInterfaceSet())
     return true;
   
   bool error = false;
   // Loopback case
-  if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
-    interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
+  if(interfaces.getInterfaceMethod(error) == INTERFACES_LOOPBACK){
+    interfaces.setAuto(interface->getInterfaceName(), autoStart->isChecked());
     return true;
   }
   
   if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
    QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok);
    return false;
   }	
-  interfaces->removeAllInterfaceOptions();
+  interfaces.removeAllInterfaceOptions();
   
   // DHCP
   if(dhcpCheckBox->isChecked()){
-    interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP);
-    interfaces->setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value()));
-    interfaces->setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60));
+    interfaces.setInterfaceMethod(INTERFACES_METHOD_DHCP);
+    interfaces.setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value()));
+    interfaces.setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60));
   }
   else{
-    interfaces->setInterfaceMethod("static");
-    interfaces->setInterfaceOption("address", ipAddressEdit->text());
-    interfaces->setInterfaceOption("netmask", subnetMaskEdit->text());
-    interfaces->setInterfaceOption("gateway", gatewayEdit->text());
+    interfaces.setInterfaceMethod("static");
+    interfaces.setInterfaceOption("address", ipAddressEdit->text());
+    interfaces.setInterfaceOption("netmask", subnetMaskEdit->text());
+    interfaces.setInterfaceOption("gateway", gatewayEdit->text());
     if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){
       QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
-      interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns);
-      interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns);
+      interfaces.setInterfaceOption("up "DNSSCRIPT" -a ", dns);
+      interfaces.setInterfaceOption("down "DNSSCRIPT" -r ", dns);
     }
   }
   
   // IP Information
-  interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
+  interfaces.setAuto(interface->getInterfaceName(), autoStart->isChecked());
   return true;
 }
 
 /**
  * The Profile has changed.
- * @profile the new profile.
+ * @param QString profile the new profile.
  */ 
 void InterfaceSetupImp::setProfile(const QString &profile){
+   /*
+  bool error = false;
+  if(interfaces.getInterfaceMethod(error) == INTERFACES_LOOPBACK){
+    staticGroupBox->hide();
+    dhcpCheckBox->hide();
+    leaseTime->hide();
+    leaseHoursLabel->hide();
+  }
+  */
+  
   QString newInterfaceName = interface->getInterfaceName();
   if(profile.length() > 0)
     newInterfaceName += "_" + profile;
-  qDebug("InterfaceSetupImp::setProfile");
   // See if we have to make a interface.
-  if(!interfaces->setInterface(newInterfaceName)){
+  if(!interfaces.setInterface(newInterfaceName)){
     // Add making for this new interface if need too
     if(profile != ""){
-      interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName);
-      if(!interfaces->setMapping(interface->getInterfaceName())){
-        interfaces->addMapping(interface->getInterfaceName());
-        if(!interfaces->setMapping(interface->getInterfaceName())){
-	  qDebug("InterfaceSetupImp: Added Mapping, but still can't set.");
+      interfaces.copyInterface(interface->getInterfaceName(), newInterfaceName);
+      if(!interfaces.setMapping(interface->getInterfaceName())){
+        interfaces.addMapping(interface->getInterfaceName());
+        if(!interfaces.setMapping(interface->getInterfaceName())){
+	  qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
           return;
 	}
       }
-      interfaces->setMap("map", newInterfaceName);
-      interfaces->setScript("getprofile.sh");
+      interfaces.setMap("map", newInterfaceName);
+      interfaces.setScript("getprofile.sh");
     }
     else{
-      interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
-      if(!interfaces->setInterface(newInterfaceName)){
-        qDebug("InterfaceSetupImp: Added interface, but still can't set.");
+      interfaces.addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
+      if(!interfaces.setInterface(newInterfaceName)){
+        qDebug("InterfaceSetupImp: Added interface, but still can't setInterface.");
         return;	      
       }
     }
   }
   
   // We must have a valid interface to get this far so read some settings.
   
   // DHCP
   bool error = false;
-  if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
+  if(interfaces.getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
     dhcpCheckBox->setChecked(true);
   else
     dhcpCheckBox->setChecked(false);
-  leaseTime->setValue(interfaces->getInterfaceOption("leasehours", error).toInt());
+  leaseTime->setValue(interfaces.getInterfaceOption("leasehours", error).toInt());
   if(error)
-    leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60);
+    leaseTime->setValue(interfaces.getInterfaceOption("leasetime", error).toInt()/60/60);
   if(error)
     leaseTime->setValue(24);
 
   // IP Information
-  autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
-  QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error);
+  autoStart->setChecked(interfaces.isAuto(interface->getInterfaceName()));
+  QString dns = interfaces.getInterfaceOption("up "DNSSCRIPT" -a", error);
   if(dns.contains(" ")){
     firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
     secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); 
   }
-  ipAddressEdit->setText(interfaces->getInterfaceOption("address", error));
-  subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error));
-  gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); 
-}
+  ipAddressEdit->setText(interfaces.getInterfaceOption("address", error));
+  subnetMaskEdit->setText(interfaces.getInterfaceOption("netmask", error));
+  gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error)); 
 
+}
   
 // interfacesetup.cpp
 
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
index 60933aa..9ec526c 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
@@ -1,14 +1,14 @@
 #ifndef INTERFACESETUPIMP_H
 #define INTERFACESETUPIMP_H
 
 #include "interfacesetup.h"
+#include "interfaces.h"
 #include <qdialog.h>
 
 class Interface;
-class Interfaces;
 
 class InterfaceSetupImp : public InterfaceSetup {
   Q_OBJECT
 	
 public:
   InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, WFlags fl = 0);
@@ -16,13 +16,13 @@ public:
   
 public slots:
   void setProfile(const QString &profile);
   bool saveSettings();
 
 private:
-  Interfaces *interfaces;
+  Interfaces interfaces;
   Interface *interface;
 };
 
 
 #include <qlayout.h>