author | benmeyer <benmeyer> | 2002-10-24 20:20:12 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-24 20:20:12 (UTC) |
commit | 57c34f2f0b35ab13e7618ba77480c9b28b83885a (patch) (side-by-side diff) | |
tree | 406fc6016ccea8d9d77a3b251361d11828e7afbc /noncore/settings/networksettings/mainwindowimp.cpp | |
parent | 013b5a78262099a55de8e7228436f2c00660e6b1 (diff) | |
download | opie-57c34f2f0b35ab13e7618ba77480c9b28b83885a.zip opie-57c34f2f0b35ab13e7618ba77480c9b28b83885a.tar.gz opie-57c34f2f0b35ab13e7618ba77480c9b28b83885a.tar.bz2 |
Fix segfault
Diffstat (limited to 'noncore/settings/networksettings/mainwindowimp.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index c86acdc..4a088cb 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -75,13 +75,13 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par }
/**
* Deconstructor. Save profiles. Delete loaded libraries.
*/
MainWindowImp::~MainWindowImp(){
- qDebug("start Saving mainwindow");
+ 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.
@@ -92,15 +92,15 @@ MainWindowImp::~MainWindowImp(){ }
// Delete Modules and Libraries
QMap<Module*, QLibrary*>::Iterator it;
for( it = libraries.begin(); it != libraries.end(); ++it ){
delete it.key();
- delete it.data();
+ //delete it.data();
}
- qDebug("done Saving mainwindow");
+ 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
@@ -241,24 +241,23 @@ void MainWindowImp::configureClicked(){ if(i->getModuleOwner()){
i->getModuleOwner()->setProfile(currentProfile);
QTabWidget *tabWidget = NULL;
QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);
if(moduleConfigure != NULL){
if(tabWidget != NULL){
- InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);
+ InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
configure->setProfile(currentProfile);
tabWidget->insertTab(configure, "TCP/IP");
-
}
moduleConfigure->showMaximized();
moduleConfigure->show();
return;
}
}
- InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
+ InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
configure->setProfile(currentProfile);
configure->showMaximized();
configure->show();
}
/**
|