| author | benmeyer <benmeyer> | 2002-10-24 20:59:43 (UTC) |
|---|---|---|
| committer | benmeyer <benmeyer> | 2002-10-24 20:59:43 (UTC) |
| commit | 34df819184611874d6f42516a63fb1f6c253fdd3 (patch) (side-by-side diff) | |
| tree | 07450559dfbe69cfefc68abacdd0875bd2e20d94 | |
| parent | 83bbc4077376e433f40f2632181a97e5ff8892b1 (diff) | |
| download | opie-34df819184611874d6f42516a63fb1f6c253fdd3.zip opie-34df819184611874d6f42516a63fb1f6c253fdd3.tar.gz opie-34df819184611874d6f42516a63fb1f6c253fdd3.tar.bz2 | |
bug fix cleanup
| -rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 3 | ||||
| -rw-r--r-- | noncore/net/networksetup/wlan/wlanmodule.cpp | 1 | ||||
| -rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 3 | ||||
| -rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 1 |
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 @@ -73,36 +73,35 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par 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){
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 @@ -10,17 +10,16 @@ * 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 */ 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 @@ -73,36 +73,35 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par 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){
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 @@ -10,17 +10,16 @@ * 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 */ |