fix interface name bug

6 files changed, 26 insertions, 28 deletions

diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp
index 1e01da4..a84b91f 100644
--- a/noncore/net/networksetup/interface.cpp
+++ b/noncore/net/networksetup/interface.cpp
@@ -13,3 +13,3 @@
 
-Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
+Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
   refresh();
@@ -45,3 +45,3 @@ void Interface::setAttached(bool isAttached){
 void Interface::setHardwareName(QString name){
-  hardareName = name;
+  hardwareName = name;
   emit(updateInterface(this));
@@ -68,3 +68,3 @@ void Interface::start(){
 
-  int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1());
+  int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1());
   // See if it was successfull...
@@ -85,3 +85,3 @@ void Interface::stop(){
 	  
-  int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1());
+  int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1());
   if(ret != 0)
@@ -121,4 +121,4 @@ bool Interface::refresh(){
 	
-  QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName);
-  int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1());
+  QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name());
+  int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1());
   if(ret != 0){
@@ -179,3 +179,3 @@ bool Interface::refresh(){
   // See if we have 
-  QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName));
+  QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name()));
   // If there is no DHCP information then exit now with no errors.
@@ -211,3 +211,3 @@ bool Interface::refresh(){
   // Get the pid of the deamond
-  dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName));
+  dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name()));
   file.setName(dhcpFile);
diff --git a/noncore/net/networksetup/interface.h b/noncore/net/networksetup/interface.h
index 980171a..7943fd6 100644
--- a/noncore/net/networksetup/interface.h
+++ b/noncore/net/networksetup/interface.h
@@ -26,3 +26,3 @@ public:
   
-  virtual QString getHardwareName(){ return hardareName; };
+  virtual QString getHardwareName(){ return hardwareName; };
   virtual void setHardwareName(QString name="Unknown");
@@ -53,3 +53,3 @@ private:
   QString interfaceName;
-  QString hardareName;
+  QString hardwareName;
   Module *moduleOwner;
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 117bac1..a446d29 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -310,3 +310,3 @@ void MainWindowImp::jobDone(KProcess *process){
       if(interfaceNames.find(interfaceName) == interfaceNames.end()){

-        if(fileName == TEMP_ALL)

+	if(fileName == TEMP_ALL)

           i = new Interface(this, interfaceName, false);

@@ -330,5 +330,4 @@ void MainWindowImp::jobDone(KProcess *process){
       else{

-        i = interfaceNames[interfaceName];

         if(fileName != TEMP_ALL)

-          i->setStatus(true);

+          (interfaceNames[interfaceName])->setStatus(true);

       }

@@ -400,3 +399,3 @@ void MainWindowImp::updateInterface(Interface *i){
     typeName = "usb";

-   

+  

   if(!i->isAttached())

diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp
index 1e01da4..a84b91f 100644
--- a/noncore/settings/networksettings/interface.cpp
+++ b/noncore/settings/networksettings/interface.cpp
@@ -13,3 +13,3 @@
 
-Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
+Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
   refresh();
@@ -45,3 +45,3 @@ void Interface::setAttached(bool isAttached){
 void Interface::setHardwareName(QString name){
-  hardareName = name;
+  hardwareName = name;
   emit(updateInterface(this));
@@ -68,3 +68,3 @@ void Interface::start(){
 
-  int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1());
+  int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1());
   // See if it was successfull...
@@ -85,3 +85,3 @@ void Interface::stop(){
 	  
-  int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1());
+  int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1());
   if(ret != 0)
@@ -121,4 +121,4 @@ bool Interface::refresh(){
 	
-  QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName);
-  int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1());
+  QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name());
+  int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1());
   if(ret != 0){
@@ -179,3 +179,3 @@ bool Interface::refresh(){
   // See if we have 
-  QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName));
+  QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name()));
   // If there is no DHCP information then exit now with no errors.
@@ -211,3 +211,3 @@ bool Interface::refresh(){
   // Get the pid of the deamond
-  dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName));
+  dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name()));
   file.setName(dhcpFile);
diff --git a/noncore/settings/networksettings/interface.h b/noncore/settings/networksettings/interface.h
index 980171a..7943fd6 100644
--- a/noncore/settings/networksettings/interface.h
+++ b/noncore/settings/networksettings/interface.h
@@ -26,3 +26,3 @@ public:
   
-  virtual QString getHardwareName(){ return hardareName; };
+  virtual QString getHardwareName(){ return hardwareName; };
   virtual void setHardwareName(QString name="Unknown");
@@ -53,3 +53,3 @@ private:
   QString interfaceName;
-  QString hardareName;
+  QString hardwareName;
   Module *moduleOwner;
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 117bac1..a446d29 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -310,3 +310,3 @@ void MainWindowImp::jobDone(KProcess *process){
       if(interfaceNames.find(interfaceName) == interfaceNames.end()){

-        if(fileName == TEMP_ALL)

+	if(fileName == TEMP_ALL)

           i = new Interface(this, interfaceName, false);

@@ -330,5 +330,4 @@ void MainWindowImp::jobDone(KProcess *process){
       else{

-        i = interfaceNames[interfaceName];

         if(fileName != TEMP_ALL)

-          i->setStatus(true);

+          (interfaceNames[interfaceName])->setStatus(true);

       }

@@ -400,3 +399,3 @@ void MainWindowImp::updateInterface(Interface *i){
     typeName = "usb";

-   

+  

   if(!i->isAttached())