Code Optimizations

36 files changed, 238 insertions, 192 deletions

diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO
index 8e57405..7185dbe 100644
--- a/noncore/net/networksetup/TODO
+++ b/noncore/net/networksetup/TODO
@@ -2,4 +2,2 @@ CLEAN UP
 
-Write a class that parses /proc and not ifconfig
-
 udchcp needs to output the dhcp information so interfaces can read it
@@ -14 +12,2 @@ WLAN - add possiblity to input text or hex without knowing "s:"
 
+Interface setupimp needs to use kernel calls.
diff --git a/noncore/net/networksetup/addconnectionimp.cpp b/noncore/net/networksetup/addconnectionimp.cpp
index 53db0fc..07545f7 100644
--- a/noncore/net/networksetup/addconnectionimp.cpp
+++ b/noncore/net/networksetup/addconnectionimp.cpp
@@ -19,5 +19,4 @@ void AddConnectionImp::changed(){
   QListViewItem *item = registeredServicesList->currentItem();
-  if(item){
+  if(item)
     help->setText(list[item->text(0)]);
-  }
 }
@@ -28,3 +27,3 @@ void AddConnectionImp::changed(){
  */ 
-void AddConnectionImp::addConnections(QMap<QString, QString> newList){
+void AddConnectionImp::addConnections(const QMap<QString, QString> &newList){
   list = newList;
diff --git a/noncore/net/networksetup/addconnectionimp.h b/noncore/net/networksetup/addconnectionimp.h
index 643cd9a..680a502 100644
--- a/noncore/net/networksetup/addconnectionimp.h
+++ b/noncore/net/networksetup/addconnectionimp.h
@@ -15,3 +15,3 @@ public:
   AddConnectionImp(QWidget *parent=0, const char *name=0, WFlags f=0);
-  void addConnections(QMap<QString, QString> newList);
+  void addConnections(const QMap<QString, QString> &newList);
    
diff --git a/noncore/net/networksetup/interfaces/interface.cpp b/noncore/net/networksetup/interfaces/interface.cpp
index e4f405e..4129b3d 100644
--- a/noncore/net/networksetup/interfaces/interface.cpp
+++ b/noncore/net/networksetup/interfaces/interface.cpp
@@ -44,3 +44,3 @@ void Interface::setAttached(bool isAttached){
  */ 
-void Interface::setHardwareName(QString name){
+void Interface::setHardwareName(const QString &name){
   hardwareName = name;
diff --git a/noncore/net/networksetup/interfaces/interface.h b/noncore/net/networksetup/interfaces/interface.h
index fc064fe..989d6d8 100644
--- a/noncore/net/networksetup/interfaces/interface.h
+++ b/noncore/net/networksetup/interfaces/interface.h
@@ -17,17 +17,16 @@ public:
   Interface(QObject * parent=0, const char * name= "unknown", bool status = false);
-  virtual ~Interface(){};
   
-  virtual QString getInterfaceName(){ QString n(this->name()); return n; };
+  QString getInterfaceName(){ QString n(this->name()); return n; };
   
-  virtual bool getStatus(){ return status; };
-  virtual void setStatus(bool newStatus);
+  bool getStatus(){ return status; };
+  void setStatus(bool newStatus);
 
-  virtual bool isAttached(){ return attached; };
-  virtual void setAttached(bool isAttached=false);
+  bool isAttached(){ return attached; };
+  void setAttached(bool isAttached=false);
   
-  virtual QString getHardwareName(){ return hardwareName; };
-  virtual void setHardwareName(QString name="Unknown");
+  QString getHardwareName(){ return hardwareName; };
+  void setHardwareName(const QString &name="Unknown");
   
-  virtual Module* getModuleOwner(){ return moduleOwner; };
-  virtual void setModuleOwner(Module *owner=NULL);
+  Module* getModuleOwner(){ return moduleOwner; };
+  void setModuleOwner(Module *owner=NULL);
 
diff --git a/noncore/net/networksetup/interfaces/interfaces.cpp b/noncore/net/networksetup/interfaces/interfaces.cpp
index f1b8067..708f399 100644
--- a/noncore/net/networksetup/interfaces/interfaces.cpp
+++ b/noncore/net/networksetup/interfaces/interfaces.cpp
@@ -72,3 +72,3 @@ QStringList Interfaces::getInterfaceList(){
  */ 
-bool Interfaces::isAuto(QString interface){
+bool Interfaces::isAuto(const QString &interface){
   QStringList autoLines = interfaces.grep(QRegExp(AUTO));
@@ -88,3 +88,3 @@ bool Interfaces::isAuto(QString interface){
  * */ 
-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.
@@ -158,9 +158,9 @@ bool Interfaces::isInterfaceSet(){
  */ 
-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;
@@ -173,3 +173,3 @@ bool Interfaces::addInterface(QString interface, QString family, QString method)
  */ 
-bool Interfaces::copyInterface(QString interface, QString newInterface){
+bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){
   if(!setInterface(interface)) return false;
@@ -282,9 +282,9 @@ QString Interfaces::getInterfaceMethod(bool &error){
  */ 
-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;  
@@ -298,3 +298,3 @@ bool Interfaces::setInterfaceName(QString newName){
  */ 
-bool Interfaces::setInterfaceFamily(QString newName){
+bool Interfaces::setInterfaceFamily(const QString &newName){
   if(currentIface == interfaces.end())
@@ -313,3 +313,3 @@ bool Interfaces::setInterfaceFamily(QString newName){
  */ 
-bool Interfaces::setInterfaceMethod(QString newName){
+bool Interfaces::setInterfaceMethod(const QString &newName){
   if(currentIface == interfaces.end())
@@ -331,3 +331,3 @@ bool Interfaces::setInterfaceMethod(QString newName){
  */ 
-QString Interfaces::getInterfaceOption(QString option, bool &error){
+QString Interfaces::getInterfaceOption(const QString &option, bool &error){
   return getOption(currentIface, option, error);
@@ -343,3 +343,3 @@ QString Interfaces::getInterfaceOption(QString option, bool &error){
  */ 
-bool Interfaces::setInterfaceOption(QString option, QString value){
+bool Interfaces::setInterfaceOption(const QString &option, const QString &value){
   return setOption(currentIface, option, value);
@@ -354,3 +354,3 @@ bool Interfaces::setInterfaceOption(QString option, QString value){
  */ 
-bool Interfaces::removeInterfaceOption(QString option, QString value){
+bool Interfaces::removeInterfaceOption(const QString &option, const QString &value){
   return removeOption(currentIface, option, value);
@@ -373,6 +373,6 @@ bool Interfaces::removeAllInterfaceOptions(){
  */ 
-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);
 }
@@ -383,3 +383,3 @@ bool Interfaces::setMapping(QString interface){
  */ 
-void Interfaces::addMapping(QString option){
+void Interfaces::addMapping(const QString &option){
   interfaces.append("");
@@ -405,3 +405,3 @@ bool Interfaces::removeMapping(){
  */ 
-bool Interfaces::setMap(QString map, QString value){
+bool Interfaces::setMap(const QString &map, const QString &value){
   return setOption(currentMapping, map, value);
@@ -415,3 +415,3 @@ bool Interfaces::setMap(QString map, QString value){
  */ 
-bool Interfaces::removeMap(QString map, QString value){
+bool Interfaces::removeMap(const QString &map, const QString &value){
   return removeOption(currentMapping, map, value);
@@ -425,3 +425,3 @@ bool Interfaces::removeMap(QString map, QString value){
  */ 
-QString Interfaces::getMap(QString map, bool &error){
+QString Interfaces::getMap(const QString &map, bool &error){
   return getOption(currentMapping, map, error);
@@ -434,3 +434,3 @@ QString Interfaces::getMap(QString map, bool &error){
  */ 
-bool Interfaces::setScript(QString argument){
+bool Interfaces::setScript(const QString &argument){
   return setOption(currentMapping, "script", argument);
@@ -446,2 +446,4 @@ QString Interfaces::getScript(bool &error){
 
+
+
 /**
@@ -454,3 +456,3 @@ QString Interfaces::getScript(bool &error){
  */ 
-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;
@@ -491,3 +493,3 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator
  */
-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())
@@ -526,3 +528,3 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
  */
-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())
@@ -552,3 +554,3 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri
  */
-bool Interfaces::removeAllOptions(QStringList::Iterator start){
+bool Interfaces::removeAllOptions(const QStringList::Iterator &start){
   if(start == interfaces.end())
@@ -577,3 +579,3 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){
  */
-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()){
diff --git a/noncore/net/networksetup/interfaces/interfaces.h b/noncore/net/networksetup/interfaces/interfaces.h
index e09ea71..26abb73 100644
--- a/noncore/net/networksetup/interfaces/interfaces.h
+++ b/noncore/net/networksetup/interfaces/interfaces.h
@@ -27,29 +27,29 @@ public:
   
-  bool isAuto(QString interface);
-  bool setAuto(QString interface, bool setAuto);
+  bool isAuto(const QString &interface);
+  bool setAuto(const QString &interface, bool setAuto);
   
   bool removeInterface();
-  bool addInterface(QString interface, QString family, QString method);
-  bool copyInterface(QString oldInterface, QString newInterface);
+  bool addInterface(const QString &interface, const QString &family, const QString &method);
+  bool copyInterface(const QString &oldInterface, const QString &newInterface);
   bool setInterface(QString interface);
-  bool isInterfaceSet();
+  inline bool isInterfaceSet();
   QString getInterfaceName(bool &error);
-  bool setInterfaceName(QString newName);
+  bool setInterfaceName(const QString &newName);
   QString getInterfaceFamily(bool &error);
-  bool setInterfaceFamily(QString newName);
+  bool setInterfaceFamily(const QString &newName);
   QString getInterfaceMethod(bool &error);
-  bool setInterfaceMethod(QString newName);
-  QString getInterfaceOption(QString option, bool &error); 
-  bool setInterfaceOption(QString option, QString value);
-  bool removeInterfaceOption(QString option, QString value);
-  bool removeAllInterfaceOptions();
+  bool setInterfaceMethod(const QString &newName);
+  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(QString interface);
+  bool setMapping(const QString &interface);
   bool removeMapping();
-  void addMapping(QString options);
-  bool setMap(QString map, QString value);
-  bool removeMap(QString map, QString value);
-  QString getMap(QString map, bool &error);
-  bool setScript(QString);
-  QString getScript(bool &error);
+  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);
 		  
@@ -58,7 +58,7 @@ public:
 private:
-  bool setStanza(QString stanza, QString option,QStringList::Iterator &iterator);
-  bool setOption(QStringList::Iterator start, QString option, QString value);
-  bool removeOption(QStringList::Iterator start, QString option, QString value);
-  QString getOption(QStringList::Iterator start, QString option, bool &error);
-  bool removeAllOptions(QStringList::Iterator start);
+  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 removeAllOptions(const QStringList::Iterator &start);
   
diff --git a/noncore/net/networksetup/interfaces/interfacesetup.ui b/noncore/net/networksetup/interfaces/interfacesetup.ui
index ab8e413..df55d25 100644
--- a/noncore/net/networksetup/interfaces/interfacesetup.ui
+++ b/noncore/net/networksetup/interfaces/interfacesetup.ui
@@ -101,2 +101,6 @@
                     <property stdset="1">
+                        <name>lineStep</name>
+                        <number>24</number>
+                    </property>
+                    <property stdset="1">
                         <name>value</name>
@@ -253,2 +257,24 @@
 </widget>
+<customwidgets>
+    <customwidget>
+        <class>QWidget</class>
+        <header location="local">qwidget.h</header>
+        <sizehint>
+            <width>100</width>
+            <height>100</height>
+        </sizehint>
+        <container>0</container>
+        <sizepolicy>
+            <hordata>7</hordata>
+            <verdata>7</verdata>
+        </sizepolicy>
+        <pixmap>image0</pixmap>
+    </customwidget>
+</customwidgets>
+<images>
+    <image>
+        <name>image0</name>
+        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
+    </image>
+</images>
 <connections>
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.h b/noncore/net/networksetup/interfaces/interfacesetupimp.h
index a88e190..60933aa 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.h
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.h
@@ -23,3 +23,2 @@ private:
   Interface *interface;
-
 };
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 48ef9b3..7b93554 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -32,3 +32,3 @@
 

-MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){

+MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false), scheme(DEFAULT_SCHEME){

   connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));

@@ -191,3 +191,3 @@ void MainWindowImp::getAllInterfaces(){
  */ 

-void MainWindowImp::loadModules(QString path){

+void MainWindowImp::loadModules(const QString &path){

   //qDebug(path.latin1());

@@ -216,3 +216,3 @@ void MainWindowImp::loadModules(QString path){
  */ 

-Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){

+Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){

   //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());

diff --git a/noncore/net/networksetup/mainwindowimp.h b/noncore/net/networksetup/mainwindowimp.h
index 382428c..4f09d6c 100644
--- a/noncore/net/networksetup/mainwindowimp.h
+++ b/noncore/net/networksetup/mainwindowimp.h
@@ -35,6 +35,6 @@ private slots:
 private:

-  void loadModules(QString path);

+  void loadModules(const QString &path);

   

-  Module* loadPlugin(QString pluginFileName,

-		     QString resolveString = "create_plugin");

+  Module* loadPlugin(const QString &pluginFileName,

+		     const QString &resolveString = "create_plugin");

 

diff --git a/noncore/net/networksetup/module.h b/noncore/net/networksetup/module.h
index 92b125a..2e6272b 100644
--- a/noncore/net/networksetup/module.h
+++ b/noncore/net/networksetup/module.h
@@ -24,3 +24,3 @@ public:
    */ 
-  virtual void setProfile(QString newProfile) = 0;
+  virtual void setProfile(const QString &newProfile) = 0;
   
@@ -72,3 +72,3 @@ public:
    */  
-  virtual Interface *addNewInterface(QString name) = 0;
+  virtual Interface *addNewInterface(const QString &name) = 0;
   
diff --git a/noncore/net/networksetup/wlan/infoimp.h b/noncore/net/networksetup/wlan/infoimp.h
index 5311bea..8f7f0d6 100644
--- a/noncore/net/networksetup/wlan/infoimp.h
+++ b/noncore/net/networksetup/wlan/infoimp.h
@@ -6,3 +6,3 @@
 class QTimer;
-class WExtensions;
+//class WExtensions;
 
diff --git a/noncore/net/networksetup/wlan/wextensions.cpp b/noncore/net/networksetup/wlan/wextensions.cpp
index eb6fc42..6335ebc 100644
--- a/noncore/net/networksetup/wlan/wextensions.cpp
+++ b/noncore/net/networksetup/wlan/wextensions.cpp
@@ -18,4 +18,3 @@
  */ 
-WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false){
-  interface = interfaceName;
+WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false), interface(interfaceName) {
   fd = socket( AF_INET, SOCK_DGRAM, 0 );
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 689eae2..d4b4af9 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -46,3 +46,3 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
  */ 
-void WLANImp::setProfile(QString &profile){
+void WLANImp::setProfile(const QString &profile){
   interfaceSetup->setProfile(profile);
diff --git a/noncore/net/networksetup/wlan/wlanimp.h b/noncore/net/networksetup/wlan/wlanimp.h
index f88e550..df599af 100644
--- a/noncore/net/networksetup/wlan/wlanimp.h
+++ b/noncore/net/networksetup/wlan/wlanimp.h
@@ -15,3 +15,3 @@ public:
   WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 );
-  void setProfile(QString &profile);
+  void setProfile(const QString &profile);
 
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index b14fc0a..3979e60 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -28,3 +28,3 @@ WLANModule::~WLANModule(){
  */ 
-void WLANModule::setProfile(QString newProfile){
+void WLANModule::setProfile(const QString &newProfile){
   profile = newProfile;
@@ -96,3 +96,3 @@ QList<Interface> WLANModule::getInterfaces(){
  */ 
-Interface *WLANModule::addNewInterface(QString ){
+Interface *WLANModule::addNewInterface(const QString &){
   // We can't add a 802.11 interface, either the hardware will be there
diff --git a/noncore/net/networksetup/wlan/wlanmodule.h b/noncore/net/networksetup/wlan/wlanmodule.h
index a81ccff..3a54de6 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.h
+++ b/noncore/net/networksetup/wlan/wlanmodule.h
@@ -14,11 +14,11 @@ public:
 
-  virtual void setProfile(QString newProfile);
-  virtual bool isOwner(Interface *);
-  virtual QWidget *configure(Interface *i);
-  virtual QWidget *information(Interface *i);
-  virtual QList<Interface> getInterfaces();
-  virtual void possibleNewInterfaces(QMap<QString, QString> &){};
-  virtual Interface *addNewInterface(QString name);
-  virtual bool remove(Interface* i);
-  virtual QString getPixmapName(Interface* i);
+  void setProfile(const QString &newProfile);
+  bool isOwner(Interface *);
+  QWidget *configure(Interface *i);
+  QWidget *information(Interface *i);
+  QList<Interface> getInterfaces();
+  void possibleNewInterfaces(QMap<QString, QString> &){};
+  Interface *addNewInterface(const QString &name);
+  bool remove(Interface* i);
+  QString getPixmapName(Interface* i);
 
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO
index 8e57405..7185dbe 100644
--- a/noncore/settings/networksettings/TODO
+++ b/noncore/settings/networksettings/TODO
@@ -2,4 +2,2 @@ CLEAN UP
 
-Write a class that parses /proc and not ifconfig
-
 udchcp needs to output the dhcp information so interfaces can read it
@@ -14 +12,2 @@ WLAN - add possiblity to input text or hex without knowing "s:"
 
+Interface setupimp needs to use kernel calls.
diff --git a/noncore/settings/networksettings/addconnectionimp.cpp b/noncore/settings/networksettings/addconnectionimp.cpp
index 53db0fc..07545f7 100644
--- a/noncore/settings/networksettings/addconnectionimp.cpp
+++ b/noncore/settings/networksettings/addconnectionimp.cpp
@@ -19,5 +19,4 @@ void AddConnectionImp::changed(){
   QListViewItem *item = registeredServicesList->currentItem();
-  if(item){
+  if(item)
     help->setText(list[item->text(0)]);
-  }
 }
@@ -28,3 +27,3 @@ void AddConnectionImp::changed(){
  */ 
-void AddConnectionImp::addConnections(QMap<QString, QString> newList){
+void AddConnectionImp::addConnections(const QMap<QString, QString> &newList){
   list = newList;
diff --git a/noncore/settings/networksettings/addconnectionimp.h b/noncore/settings/networksettings/addconnectionimp.h
index 643cd9a..680a502 100644
--- a/noncore/settings/networksettings/addconnectionimp.h
+++ b/noncore/settings/networksettings/addconnectionimp.h
@@ -15,3 +15,3 @@ public:
   AddConnectionImp(QWidget *parent=0, const char *name=0, WFlags f=0);
-  void addConnections(QMap<QString, QString> newList);
+  void addConnections(const QMap<QString, QString> &newList);
    
diff --git a/noncore/settings/networksettings/interfaces/interface.cpp b/noncore/settings/networksettings/interfaces/interface.cpp
index e4f405e..4129b3d 100644
--- a/noncore/settings/networksettings/interfaces/interface.cpp
+++ b/noncore/settings/networksettings/interfaces/interface.cpp
@@ -44,3 +44,3 @@ void Interface::setAttached(bool isAttached){
  */ 
-void Interface::setHardwareName(QString name){
+void Interface::setHardwareName(const QString &name){
   hardwareName = name;
diff --git a/noncore/settings/networksettings/interfaces/interface.h b/noncore/settings/networksettings/interfaces/interface.h
index fc064fe..989d6d8 100644
--- a/noncore/settings/networksettings/interfaces/interface.h
+++ b/noncore/settings/networksettings/interfaces/interface.h
@@ -17,17 +17,16 @@ public:
   Interface(QObject * parent=0, const char * name= "unknown", bool status = false);
-  virtual ~Interface(){};
   
-  virtual QString getInterfaceName(){ QString n(this->name()); return n; };
+  QString getInterfaceName(){ QString n(this->name()); return n; };
   
-  virtual bool getStatus(){ return status; };
-  virtual void setStatus(bool newStatus);
+  bool getStatus(){ return status; };
+  void setStatus(bool newStatus);
 
-  virtual bool isAttached(){ return attached; };
-  virtual void setAttached(bool isAttached=false);
+  bool isAttached(){ return attached; };
+  void setAttached(bool isAttached=false);
   
-  virtual QString getHardwareName(){ return hardwareName; };
-  virtual void setHardwareName(QString name="Unknown");
+  QString getHardwareName(){ return hardwareName; };
+  void setHardwareName(const QString &name="Unknown");
   
-  virtual Module* getModuleOwner(){ return moduleOwner; };
-  virtual void setModuleOwner(Module *owner=NULL);
+  Module* getModuleOwner(){ return moduleOwner; };
+  void setModuleOwner(Module *owner=NULL);
 
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
@@ -72,3 +72,3 @@ QStringList Interfaces::getInterfaceList(){
  */ 
-bool Interfaces::isAuto(QString interface){
+bool Interfaces::isAuto(const QString &interface){
   QStringList autoLines = interfaces.grep(QRegExp(AUTO));
@@ -88,3 +88,3 @@ bool Interfaces::isAuto(QString interface){
  * */ 
-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.
@@ -158,9 +158,9 @@ bool Interfaces::isInterfaceSet(){
  */ 
-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;
@@ -173,3 +173,3 @@ bool Interfaces::addInterface(QString interface, QString family, QString method)
  */ 
-bool Interfaces::copyInterface(QString interface, QString newInterface){
+bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){
   if(!setInterface(interface)) return false;
@@ -282,9 +282,9 @@ QString Interfaces::getInterfaceMethod(bool &error){
  */ 
-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;  
@@ -298,3 +298,3 @@ bool Interfaces::setInterfaceName(QString newName){
  */ 
-bool Interfaces::setInterfaceFamily(QString newName){
+bool Interfaces::setInterfaceFamily(const QString &newName){
   if(currentIface == interfaces.end())
@@ -313,3 +313,3 @@ bool Interfaces::setInterfaceFamily(QString newName){
  */ 
-bool Interfaces::setInterfaceMethod(QString newName){
+bool Interfaces::setInterfaceMethod(const QString &newName){
   if(currentIface == interfaces.end())
@@ -331,3 +331,3 @@ bool Interfaces::setInterfaceMethod(QString newName){
  */ 
-QString Interfaces::getInterfaceOption(QString option, bool &error){
+QString Interfaces::getInterfaceOption(const QString &option, bool &error){
   return getOption(currentIface, option, error);
@@ -343,3 +343,3 @@ QString Interfaces::getInterfaceOption(QString option, bool &error){
  */ 
-bool Interfaces::setInterfaceOption(QString option, QString value){
+bool Interfaces::setInterfaceOption(const QString &option, const QString &value){
   return setOption(currentIface, option, value);
@@ -354,3 +354,3 @@ bool Interfaces::setInterfaceOption(QString option, QString value){
  */ 
-bool Interfaces::removeInterfaceOption(QString option, QString value){
+bool Interfaces::removeInterfaceOption(const QString &option, const QString &value){
   return removeOption(currentIface, option, value);
@@ -373,6 +373,6 @@ bool Interfaces::removeAllInterfaceOptions(){
  */ 
-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);
 }
@@ -383,3 +383,3 @@ bool Interfaces::setMapping(QString interface){
  */ 
-void Interfaces::addMapping(QString option){
+void Interfaces::addMapping(const QString &option){
   interfaces.append("");
@@ -405,3 +405,3 @@ bool Interfaces::removeMapping(){
  */ 
-bool Interfaces::setMap(QString map, QString value){
+bool Interfaces::setMap(const QString &map, const QString &value){
   return setOption(currentMapping, map, value);
@@ -415,3 +415,3 @@ bool Interfaces::setMap(QString map, QString value){
  */ 
-bool Interfaces::removeMap(QString map, QString value){
+bool Interfaces::removeMap(const QString &map, const QString &value){
   return removeOption(currentMapping, map, value);
@@ -425,3 +425,3 @@ bool Interfaces::removeMap(QString map, QString value){
  */ 
-QString Interfaces::getMap(QString map, bool &error){
+QString Interfaces::getMap(const QString &map, bool &error){
   return getOption(currentMapping, map, error);
@@ -434,3 +434,3 @@ QString Interfaces::getMap(QString map, bool &error){
  */ 
-bool Interfaces::setScript(QString argument){
+bool Interfaces::setScript(const QString &argument){
   return setOption(currentMapping, "script", argument);
@@ -446,2 +446,4 @@ QString Interfaces::getScript(bool &error){
 
+
+
 /**
@@ -454,3 +456,3 @@ QString Interfaces::getScript(bool &error){
  */ 
-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;
@@ -491,3 +493,3 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator
  */
-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())
@@ -526,3 +528,3 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
  */
-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())
@@ -552,3 +554,3 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri
  */
-bool Interfaces::removeAllOptions(QStringList::Iterator start){
+bool Interfaces::removeAllOptions(const QStringList::Iterator &start){
   if(start == interfaces.end())
@@ -577,3 +579,3 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){
  */
-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()){
diff --git a/noncore/settings/networksettings/interfaces/interfaces.h b/noncore/settings/networksettings/interfaces/interfaces.h
index e09ea71..26abb73 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.h
+++ b/noncore/settings/networksettings/interfaces/interfaces.h
@@ -27,29 +27,29 @@ public:
   
-  bool isAuto(QString interface);
-  bool setAuto(QString interface, bool setAuto);
+  bool isAuto(const QString &interface);
+  bool setAuto(const QString &interface, bool setAuto);
   
   bool removeInterface();
-  bool addInterface(QString interface, QString family, QString method);
-  bool copyInterface(QString oldInterface, QString newInterface);
+  bool addInterface(const QString &interface, const QString &family, const QString &method);
+  bool copyInterface(const QString &oldInterface, const QString &newInterface);
   bool setInterface(QString interface);
-  bool isInterfaceSet();
+  inline bool isInterfaceSet();
   QString getInterfaceName(bool &error);
-  bool setInterfaceName(QString newName);
+  bool setInterfaceName(const QString &newName);
   QString getInterfaceFamily(bool &error);
-  bool setInterfaceFamily(QString newName);
+  bool setInterfaceFamily(const QString &newName);
   QString getInterfaceMethod(bool &error);
-  bool setInterfaceMethod(QString newName);
-  QString getInterfaceOption(QString option, bool &error); 
-  bool setInterfaceOption(QString option, QString value);
-  bool removeInterfaceOption(QString option, QString value);
-  bool removeAllInterfaceOptions();
+  bool setInterfaceMethod(const QString &newName);
+  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(QString interface);
+  bool setMapping(const QString &interface);
   bool removeMapping();
-  void addMapping(QString options);
-  bool setMap(QString map, QString value);
-  bool removeMap(QString map, QString value);
-  QString getMap(QString map, bool &error);
-  bool setScript(QString);
-  QString getScript(bool &error);
+  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);
 		  
@@ -58,7 +58,7 @@ public:
 private:
-  bool setStanza(QString stanza, QString option,QStringList::Iterator &iterator);
-  bool setOption(QStringList::Iterator start, QString option, QString value);
-  bool removeOption(QStringList::Iterator start, QString option, QString value);
-  QString getOption(QStringList::Iterator start, QString option, bool &error);
-  bool removeAllOptions(QStringList::Iterator start);
+  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 removeAllOptions(const QStringList::Iterator &start);
   
diff --git a/noncore/settings/networksettings/interfaces/interfacesetup.ui b/noncore/settings/networksettings/interfaces/interfacesetup.ui
index ab8e413..df55d25 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfaces/interfacesetup.ui
@@ -101,2 +101,6 @@
                     <property stdset="1">
+                        <name>lineStep</name>
+                        <number>24</number>
+                    </property>
+                    <property stdset="1">
                         <name>value</name>
@@ -253,2 +257,24 @@
 </widget>
+<customwidgets>
+    <customwidget>
+        <class>QWidget</class>
+        <header location="local">qwidget.h</header>
+        <sizehint>
+            <width>100</width>
+            <height>100</height>
+        </sizehint>
+        <container>0</container>
+        <sizepolicy>
+            <hordata>7</hordata>
+            <verdata>7</verdata>
+        </sizepolicy>
+        <pixmap>image0</pixmap>
+    </customwidget>
+</customwidgets>
+<images>
+    <image>
+        <name>image0</name>
+        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
+    </image>
+</images>
 <connections>
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
index a88e190..60933aa 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
@@ -23,3 +23,2 @@ private:
   Interface *interface;
-
 };
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 48ef9b3..7b93554 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -32,3 +32,3 @@
 

-MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){

+MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false), scheme(DEFAULT_SCHEME){

   connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));

@@ -191,3 +191,3 @@ void MainWindowImp::getAllInterfaces(){
  */ 

-void MainWindowImp::loadModules(QString path){

+void MainWindowImp::loadModules(const QString &path){

   //qDebug(path.latin1());

@@ -216,3 +216,3 @@ void MainWindowImp::loadModules(QString path){
  */ 

-Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){

+Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){

   //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());

diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 382428c..4f09d6c 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -35,6 +35,6 @@ private slots:
 private:

-  void loadModules(QString path);

+  void loadModules(const QString &path);

   

-  Module* loadPlugin(QString pluginFileName,

-		     QString resolveString = "create_plugin");

+  Module* loadPlugin(const QString &pluginFileName,

+		     const QString &resolveString = "create_plugin");

 

diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index 92b125a..2e6272b 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -24,3 +24,3 @@ public:
    */ 
-  virtual void setProfile(QString newProfile) = 0;
+  virtual void setProfile(const QString &newProfile) = 0;
   
@@ -72,3 +72,3 @@ public:
    */  
-  virtual Interface *addNewInterface(QString name) = 0;
+  virtual Interface *addNewInterface(const QString &name) = 0;
   
diff --git a/noncore/settings/networksettings/wlan/infoimp.h b/noncore/settings/networksettings/wlan/infoimp.h
index 5311bea..8f7f0d6 100644
--- a/noncore/settings/networksettings/wlan/infoimp.h
+++ b/noncore/settings/networksettings/wlan/infoimp.h
@@ -6,3 +6,3 @@
 class QTimer;
-class WExtensions;
+//class WExtensions;
 
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index eb6fc42..6335ebc 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -18,4 +18,3 @@
  */ 
-WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false){
-  interface = interfaceName;
+WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false), interface(interfaceName) {
   fd = socket( AF_INET, SOCK_DGRAM, 0 );
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 689eae2..d4b4af9 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -46,3 +46,3 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
  */ 
-void WLANImp::setProfile(QString &profile){
+void WLANImp::setProfile(const QString &profile){
   interfaceSetup->setProfile(profile);
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h
index f88e550..df599af 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.h
+++ b/noncore/settings/networksettings/wlan/wlanimp.h
@@ -15,3 +15,3 @@ public:
   WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 );
-  void setProfile(QString &profile);
+  void setProfile(const QString &profile);
 
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index b14fc0a..3979e60 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -28,3 +28,3 @@ WLANModule::~WLANModule(){
  */ 
-void WLANModule::setProfile(QString newProfile){
+void WLANModule::setProfile(const QString &newProfile){
   profile = newProfile;
@@ -96,3 +96,3 @@ QList<Interface> WLANModule::getInterfaces(){
  */ 
-Interface *WLANModule::addNewInterface(QString ){
+Interface *WLANModule::addNewInterface(const QString &){
   // We can't add a 802.11 interface, either the hardware will be there
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h
index a81ccff..3a54de6 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.h
+++ b/noncore/settings/networksettings/wlan/wlanmodule.h
@@ -14,11 +14,11 @@ public:
 
-  virtual void setProfile(QString newProfile);
-  virtual bool isOwner(Interface *);
-  virtual QWidget *configure(Interface *i);
-  virtual QWidget *information(Interface *i);
-  virtual QList<Interface> getInterfaces();
-  virtual void possibleNewInterfaces(QMap<QString, QString> &){};
-  virtual Interface *addNewInterface(QString name);
-  virtual bool remove(Interface* i);
-  virtual QString getPixmapName(Interface* i);
+  void setProfile(const QString &newProfile);
+  bool isOwner(Interface *);
+  QWidget *configure(Interface *i);
+  QWidget *information(Interface *i);
+  QList<Interface> getInterfaces();
+  void possibleNewInterfaces(QMap<QString, QString> &){};
+  Interface *addNewInterface(const QString &name);
+  bool remove(Interface* i);
+  QString getPixmapName(Interface* i);