author | benmeyer <benmeyer> | 2002-10-24 20:59:43 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-24 20:59:43 (UTC) |
commit | 34df819184611874d6f42516a63fb1f6c253fdd3 (patch) (unidiff) | |
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 | |||
@@ -77,9 +77,8 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
77 | /** | 77 | /** |
78 | * Deconstructor. Save profiles. Delete loaded libraries. | 78 | * Deconstructor. Save profiles. Delete loaded libraries. |
79 | */ | 79 | */ |
80 | MainWindowImp::~MainWindowImp(){ | 80 | MainWindowImp::~MainWindowImp(){ |
81 | qDebug("Deleting main window"); | ||
82 | // Save profiles. | 81 | // Save profiles. |
83 | Config cfg("NetworkSetup"); | 82 | Config cfg("NetworkSetup"); |
84 | cfg.setGroup("General"); | 83 | cfg.setGroup("General"); |
85 | cfg.writeEntry("Profiles", profiles.join(" ")); | 84 | cfg.writeEntry("Profiles", profiles.join(" ")); |
@@ -94,11 +93,11 @@ MainWindowImp::~MainWindowImp(){ | |||
94 | // Delete Modules and Libraries | 93 | // Delete Modules and Libraries |
95 | QMap<Module*, QLibrary*>::Iterator it; | 94 | QMap<Module*, QLibrary*>::Iterator it; |
96 | for( it = libraries.begin(); it != libraries.end(); ++it ){ | 95 | for( it = libraries.begin(); it != libraries.end(); ++it ){ |
97 | delete it.key(); | 96 | delete it.key(); |
97 | // I wonder why I can't delete the libraries | ||
98 | //delete it.data(); | 98 | //delete it.data(); |
99 | } | 99 | } |
100 | qDebug("Done deleting main window"); | ||
101 | } | 100 | } |
102 | 101 | ||
103 | /** | 102 | /** |
104 | * Load all modules that are found in the path | 103 | * Load all modules that are found in the 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 | |||
@@ -14,9 +14,8 @@ WLANModule::WLANModule() : Module() { | |||
14 | 14 | ||
15 | /** | 15 | /** |
16 | */ | 16 | */ |
17 | WLANModule::~WLANModule(){ | 17 | WLANModule::~WLANModule(){ |
18 | qDebug("Deleting module"); | ||
19 | Interface *i; | 18 | Interface *i; |
20 | for ( i=list.first(); i != 0; i=list.next() ) | 19 | for ( i=list.first(); i != 0; i=list.next() ) |
21 | delete i; | 20 | delete i; |
22 | } | 21 | } |
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 | |||
@@ -77,9 +77,8 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
77 | /** | 77 | /** |
78 | * Deconstructor. Save profiles. Delete loaded libraries. | 78 | * Deconstructor. Save profiles. Delete loaded libraries. |
79 | */ | 79 | */ |
80 | MainWindowImp::~MainWindowImp(){ | 80 | MainWindowImp::~MainWindowImp(){ |
81 | qDebug("Deleting main window"); | ||
82 | // Save profiles. | 81 | // Save profiles. |
83 | Config cfg("NetworkSetup"); | 82 | Config cfg("NetworkSetup"); |
84 | cfg.setGroup("General"); | 83 | cfg.setGroup("General"); |
85 | cfg.writeEntry("Profiles", profiles.join(" ")); | 84 | cfg.writeEntry("Profiles", profiles.join(" ")); |
@@ -94,11 +93,11 @@ MainWindowImp::~MainWindowImp(){ | |||
94 | // Delete Modules and Libraries | 93 | // Delete Modules and Libraries |
95 | QMap<Module*, QLibrary*>::Iterator it; | 94 | QMap<Module*, QLibrary*>::Iterator it; |
96 | for( it = libraries.begin(); it != libraries.end(); ++it ){ | 95 | for( it = libraries.begin(); it != libraries.end(); ++it ){ |
97 | delete it.key(); | 96 | delete it.key(); |
97 | // I wonder why I can't delete the libraries | ||
98 | //delete it.data(); | 98 | //delete it.data(); |
99 | } | 99 | } |
100 | qDebug("Done deleting main window"); | ||
101 | } | 100 | } |
102 | 101 | ||
103 | /** | 102 | /** |
104 | * Load all modules that are found in the path | 103 | * Load all modules that are found in the 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 | |||
@@ -14,9 +14,8 @@ WLANModule::WLANModule() : Module() { | |||
14 | 14 | ||
15 | /** | 15 | /** |
16 | */ | 16 | */ |
17 | WLANModule::~WLANModule(){ | 17 | WLANModule::~WLANModule(){ |
18 | qDebug("Deleting module"); | ||
19 | Interface *i; | 18 | Interface *i; |
20 | for ( i=list.first(); i != 0; i=list.next() ) | 19 | for ( i=list.first(); i != 0; i=list.next() ) |
21 | delete i; | 20 | delete i; |
22 | } | 21 | } |