bug fix cleanup

4 files changed, 2 insertions, 6 deletions

diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 4a088cb..f9ca83b 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -69,44 +69,43 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
 	currentProfileLabel->setText(line);

 	break;

       }

     }

     file.close();

   }

 }

 

 /**

  * Deconstructor. Save profiles.  Delete loaded libraries.

  */

 MainWindowImp::~MainWindowImp(){

-  qDebug("Deleting main window");

   // Save profiles.

   Config cfg("NetworkSetup");

   cfg.setGroup("General");

   cfg.writeEntry("Profiles", profiles.join(" "));

   

   // Delete all interfaces that don't have owners.

   QMap<Interface*, QListViewItem*>::Iterator iIt;

   for( iIt = items.begin(); iIt != items.end(); ++iIt ){

     if(iIt.key()->getModuleOwner() == NULL)

       delete iIt.key();

   }

   

   // Delete Modules and Libraries

   QMap<Module*, QLibrary*>::Iterator it;

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

     delete it.key();

+    // I wonder why I can't delete the libraries

     //delete it.data();

   }

-  qDebug("Done deleting main window");

 }

 

 /**

  * Load all modules that are found in the path

  * @param path a directory that is scaned for any plugins that can be loaded

  *  and attempts to load them

  */ 

 void MainWindowImp::loadModules(QString path){

   //qDebug(path.latin1());

   QDir d(path);

   if(!d.exists())

     return;

diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index 3363b8a..bf2589e 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -6,25 +6,24 @@
 #include <qlabel.h>
 #include <qprogressbar.h>
 
 /**
  * Constructor, find all of the possible interfaces
  */ 
 WLANModule::WLANModule() : Module() {
 }
 
 /**
  */ 
 WLANModule::~WLANModule(){
-  qDebug("Deleting module");
   Interface *i;
   for ( i=list.first(); i != 0; i=list.next() )
     delete i;
 }
 
 /**
  * Change the current profile
  */ 
 void WLANModule::setProfile(QString newProfile){
   profile = newProfile;
 }
 
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 4a088cb..f9ca83b 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -69,44 +69,43 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
 	currentProfileLabel->setText(line);

 	break;

       }

     }

     file.close();

   }

 }

 

 /**

  * Deconstructor. Save profiles.  Delete loaded libraries.

  */

 MainWindowImp::~MainWindowImp(){

-  qDebug("Deleting main window");

   // Save profiles.

   Config cfg("NetworkSetup");

   cfg.setGroup("General");

   cfg.writeEntry("Profiles", profiles.join(" "));

   

   // Delete all interfaces that don't have owners.

   QMap<Interface*, QListViewItem*>::Iterator iIt;

   for( iIt = items.begin(); iIt != items.end(); ++iIt ){

     if(iIt.key()->getModuleOwner() == NULL)

       delete iIt.key();

   }

   

   // Delete Modules and Libraries

   QMap<Module*, QLibrary*>::Iterator it;

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

     delete it.key();

+    // I wonder why I can't delete the libraries

     //delete it.data();

   }

-  qDebug("Done deleting main window");

 }

 

 /**

  * Load all modules that are found in the path

  * @param path a directory that is scaned for any plugins that can be loaded

  *  and attempts to load them

  */ 

 void MainWindowImp::loadModules(QString path){

   //qDebug(path.latin1());

   QDir d(path);

   if(!d.exists())

     return;

diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 3363b8a..bf2589e 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -6,25 +6,24 @@
 #include <qlabel.h>
 #include <qprogressbar.h>
 
 /**
  * Constructor, find all of the possible interfaces
  */ 
 WLANModule::WLANModule() : Module() {
 }
 
 /**
  */ 
 WLANModule::~WLANModule(){
-  qDebug("Deleting module");
   Interface *i;
   for ( i=list.first(); i != 0; i=list.next() )
     delete i;
 }
 
 /**
  * Change the current profile
  */ 
 void WLANModule::setProfile(QString newProfile){
   profile = newProfile;
 }