1 files changed, 32 insertions, 30 deletions

diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp
index f1b8067..708f399 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaces.cpp
@@ -71,5 +71,5 @@ QStringList Interfaces::getInterfaceList(){
  * @return true is interface is in auto
  */ 
-bool Interfaces::isAuto(QString interface){
+bool Interfaces::isAuto(const QString &interface){
   QStringList autoLines = interfaces.grep(QRegExp(AUTO));
   QStringList awi = autoLines.grep(QRegExp(interface));
@@ -87,5 +87,5 @@ bool Interfaces::isAuto(QString interface){
  * @return false if already set to setAuto.
  * */ 
-bool Interfaces::setAuto(QString interface, bool setAuto){
+bool Interfaces::setAuto(const QString &interface, bool setAuto){
   // Don't need to set it if it is already set.
   if(isAuto(interface) == setAuto)
@@ -157,11 +157,11 @@ bool Interfaces::isInterfaceSet(){
  * @return true if successfull.
  */ 
-bool Interfaces::addInterface(QString interface, QString family, QString method){
+bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){
   if(acceptedFamily.contains(family)==0)
     return false;
-  interface = interface.simplifyWhiteSpace();
-  interface = interface.replace(QRegExp(" "), "");
+  QString newInterface = interface.simplifyWhiteSpace();
+  newInterface = newInterface.replace(QRegExp(" "), "");
   interfaces.append("");
-  interfaces.append(QString(IFACE " %1 %2 %3").arg(interface).arg(family).arg(method));
+  interfaces.append(QString(IFACE " %1 %2 %3").arg(newInterface).arg(family).arg(method));
   return true;
 }
@@ -172,5 +172,5 @@ bool Interfaces::addInterface(QString interface, QString family, QString method)
  * @return bool true if successfull
  */ 
-bool Interfaces::copyInterface(QString interface, QString newInterface){
+bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){
   if(!setInterface(interface)) return false;
          
@@ -281,11 +281,11 @@ QString Interfaces::getInterfaceMethod(bool &error){
  * @return bool true if successfull.
  */ 
-bool Interfaces::setInterfaceName(QString newName){
+bool Interfaces::setInterfaceName(const QString &newName){
   if(currentIface == interfaces.end())
     return false;
-  newName = newName.simplifyWhiteSpace();
-  newName = newName.replace(QRegExp(" "), "");
+  QString name = newName.simplifyWhiteSpace();
+  name = name.replace(QRegExp(" "), "");
   bool returnValue = false;
-  (*currentIface) = QString("iface %1 %2 %3").arg(newName).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue));
+  (*currentIface) = QString("iface %1 %2 %3").arg(name).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue));
   return !returnValue;  
 }
@@ -297,5 +297,5 @@ bool Interfaces::setInterfaceName(QString newName){
  * @return bool true if successfull.
  */ 
-bool Interfaces::setInterfaceFamily(QString newName){
+bool Interfaces::setInterfaceFamily(const QString &newName){
   if(currentIface == interfaces.end())
     return false;
@@ -312,5 +312,5 @@ bool Interfaces::setInterfaceFamily(QString newName){
  * @return bool true if successfull.
  */ 
-bool Interfaces::setInterfaceMethod(QString newName){
+bool Interfaces::setInterfaceMethod(const QString &newName){
   if(currentIface == interfaces.end())
     return false;
@@ -330,5 +330,5 @@ bool Interfaces::setInterfaceMethod(QString newName){
  * @return QString the options value. QString::null if error == true
  */ 
-QString Interfaces::getInterfaceOption(QString option, bool &error){
+QString Interfaces::getInterfaceOption(const QString &option, bool &error){
   return getOption(currentIface, option, error);
 }
@@ -342,5 +342,5 @@ QString Interfaces::getInterfaceOption(QString option, bool &error){
  * @return QString the options value. QString::null if error == true
  */ 
-bool Interfaces::setInterfaceOption(QString option, QString value){
+bool Interfaces::setInterfaceOption(const QString &option, const QString &value){
   return setOption(currentIface, option, value);
 }
@@ -353,5 +353,5 @@ bool Interfaces::setInterfaceOption(QString option, QString value){
  * @return QString the options value. QString::null if error == true
  */ 
-bool Interfaces::removeInterfaceOption(QString option, QString value){
+bool Interfaces::removeInterfaceOption(const QString &option, const QString &value){
   return removeOption(currentIface, option, value);
 }
@@ -372,8 +372,8 @@ bool Interfaces::removeAllInterfaceOptions(){
  * @return bool true if it is successfull. 
  */ 
-bool Interfaces::setMapping(QString interface){
-  interface = interface.simplifyWhiteSpace();
-  interface = interface.replace(QRegExp(" "), "");
-  return setStanza(MAPPING, interface, currentMapping);
+bool Interfaces::setMapping(const QString &interface){
+  QString interfaceName = interface.simplifyWhiteSpace();
+  interfaceName = interfaceName.replace(QRegExp(" "), "");
+  return setStanza(MAPPING, interfaceName, currentMapping);
 }
 
@@ -382,5 +382,5 @@ bool Interfaces::setMapping(QString interface){
  * @param interface the name(s) of the interfaces to set to this mapping
  */ 
-void Interfaces::addMapping(QString option){
+void Interfaces::addMapping(const QString &option){
   interfaces.append("");
   interfaces.append(QString(MAPPING " %1").arg(option));
@@ -404,5 +404,5 @@ bool Interfaces::removeMapping(){
  * @return bool true if it is successfull.
  */ 
-bool Interfaces::setMap(QString map, QString value){
+bool Interfaces::setMap(const QString &map, const QString &value){
   return setOption(currentMapping, map, value);
 }
@@ -414,5 +414,5 @@ bool Interfaces::setMap(QString map, QString value){
  * @return bool true if it is successfull.
  */ 
-bool Interfaces::removeMap(QString map, QString value){
+bool Interfaces::removeMap(const QString &map, const QString &value){
   return removeOption(currentMapping, map, value);
 }
@@ -424,5 +424,5 @@ bool Interfaces::removeMap(QString map, QString value){
  * @return value that goes to the map
  */ 
-QString Interfaces::getMap(QString map, bool &error){
+QString Interfaces::getMap(const QString &map, bool &error){
   return getOption(currentMapping, map, error);
 }
@@ -433,5 +433,5 @@ QString Interfaces::getMap(QString map, bool &error){
  * @return true if successfull.
  */ 
-bool Interfaces::setScript(QString argument){
+bool Interfaces::setScript(const QString &argument){
   return setOption(currentMapping, "script", argument);
 }
@@ -445,4 +445,6 @@ QString Interfaces::getScript(bool &error){
 }
 
+
+
 /**
  * Helper function used to parse through the QStringList and put pointers in 
@@ -453,5 +455,5 @@ QString Interfaces::getScript(bool &error){
  * @return bool true if the stanza is found.
  */ 
-bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator &iterator){
+bool Interfaces::setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator){
   bool found = false;
   iterator = interfaces.end();
@@ -490,5 +492,5 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator
  * @return bool true if successfull, false otherwise.
  */
-bool Interfaces::setOption(QStringList::Iterator start, QString option, QString value){
+bool Interfaces::setOption(const QStringList::Iterator &start, const QString &option, const QString &value){
   if(start == interfaces.end())
     return false;
@@ -525,5 +527,5 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
  * @return bool true if successfull, false otherwise.
  */
-bool Interfaces::removeOption(QStringList::Iterator start, QString option, QString value){
+bool Interfaces::removeOption(const QStringList::Iterator &start, const QString &option, const QString &value){
   if(start == interfaces.end())
     return false;
@@ -551,5 +553,5 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri
  * @return bool true if successfull, false otherwise.
  */
-bool Interfaces::removeAllOptions(QStringList::Iterator start){
+bool Interfaces::removeAllOptions(const QStringList::Iterator &start){
   if(start == interfaces.end())
     return false;
@@ -576,5 +578,5 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){
  * @return QString the value of option QString::null() if error == true.
  */
-QString Interfaces::getOption(QStringList::Iterator start, QString option, bool &error){
+QString Interfaces::getOption(const QStringList::Iterator &start, const QString &option, bool &error){
   if(start == interfaces.end()){
     error = false;