interface is now a qobject

1 files changed, 23 insertions, 20 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index b46362f..117bac1 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -295,73 +295,74 @@ void MainWindowImp::jobDone(KProcess *process){
     return;

   }

   

   QTextStream stream( &file );

   QString line;

   while ( !stream.eof() ) {

     line = stream.readLine();

     int space = line.find(" ");

     if(space > 1){

       // We have found an interface

       QString interfaceName = line.mid(0, space);

       Interface *i;

+      // We have found an interface

+      //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());

       // See if we already have it

       if(interfaceNames.find(interfaceName) == interfaceNames.end()){

         if(fileName == TEMP_ALL)

-          i = new Interface(interfaceName, false);

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

         else

-          i = new Interface(interfaceName, true);

+          i = new Interface(this, interfaceName, true);

+        i->setAttached(true);

+

+        QString hardName = "Ethernet";

+        int hardwareName = line.find("Link encap:");

+        int macAddress = line.find("HWaddr");

+        if(macAddress == -1)

+          macAddress = line.length();

+        if(hardwareName != -1)

+          i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));

+      

+        interfaceNames.insert(i->getInterfaceName(), i);

+        updateInterface(i);

+        connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

       }

+      // It was an interface we already had.

       else{

         i = interfaceNames[interfaceName];

         if(fileName != TEMP_ALL)

           i->setStatus(true);

       }

-      

-      i->setAttached(true);

-      i->setInterfaceName(interfaceName);

-

-      QString hardName = "Ethernet";

-      int hardwareName = line.find("Link encap:");

-      int macAddress = line.find("HWaddr");

-      if(macAddress == -1)

-        macAddress = line.length();

-      if(hardwareName != -1)

-        i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));

-      // We have found an interface

-      //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());

-      interfaceNames.insert(i->getInterfaceName(), i);

-      updateInterface(i);

     }

   }

   file.close();

   QFile::remove(fileName);

   

   if(threads.count() == 0){

     Interfaces i;

     QStringList list = i.getInterfaceList();

     QMap<QString, Interface*>::Iterator it;

     for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) {

       bool found = false;

       for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){

         if(it.key() == (*ni))

           found = true;

       }

       if(!found){

-        Interface *i = new Interface(*ni, false);

+        Interface *i = new Interface(this, *ni, false);

         i->setAttached(false);

         i->setHardwareName(QString("Disconnected (%1)").arg(*ni));

-        i->setInterfaceName(*ni);

         interfaceNames.insert(i->getInterfaceName(), i);

         updateInterface(i);

+              connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

       }

     }

   }

 } 

 

 /**

  * Update this interface.  If no QListViewItem exists create one.

  * @param Interface* pointer to the interface that needs to be updated.

  */ 

 void MainWindowImp::updateInterface(Interface *i){

   if(!advancedUserMode){

     if(i->getInterfaceName() == "lo")

@@ -386,25 +387,27 @@ void MainWindowImp::updateInterface(Interface *i){
     item = items[i];

  

   // Update the icons and information 

   item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));

  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     typeName = "lo";

   if(i->getInterfaceName().contains("irda"))

     typeName = "irda";

   if(i->getInterfaceName().contains("wlan"))

     typeName = "wlan";

-  

+  if(i->getInterfaceName().contains("usb"))

+    typeName = "usb";

+   

   if(!i->isAttached())

     typeName = "connect_no";

   // Actually try to use the Module

   if(i->getModuleOwner() != NULL)

     typeName = i->getModuleOwner()->getPixmapName(i);

   

   item->setPixmap(1, (Resource::loadPixmap(typeName)));

   item->setText(2, i->getHardwareName());

   item->setText(3, (i->getStatus()) ? i->getIp() : QString(""));

 }

 

 void MainWindowImp::newProfileChanged(const QString& newText){